repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'js/mingw-shutdown'
2011-05-09
Junio C
Hamano
conver
t
:
make it
s
afer to add conversion attr
i
but
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-09
Junio
C
Hamano
conver
t
: give
s
a
n
e
r names to crlf/e
o
l variable
s
,
types
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-09
Junio C Hama
n
o
conv
e
rt: re
n
a
me the "eol
"
global
v
a
r
iable to "core_eol
"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-09
Jun
i
o C H
a
mano
t1507
:
av
o
id
"
${para
m
eter<op>'word'
}
"
i
nside double
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-08
Junio C Ham
a
n
o
t3701:
a
dd-p-
f
ix makes t
h
e l
a
st test to pass
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-08
Junio C Hamano
rerere: libify re
r
e
r
e_clea
r
(
)
and rerere_gc()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
Junio C H
a
m
ano
merge: introduce
m
e
rge
.
ff configuration
v
ariable
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
J
u
ni
o
C Hamano
Merge
branch
'jc/
m
aint-b
r
a
nc
h
-mergeoptions' i
n
to mg
.
.
.
commit
|
commitdiff
|
tree
2011-05-06
Junio C Hamano
merge: make branch
.
<name>
.
mergeo
p
tio
n
s corre
c
t
l
y override
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
Junio C Hamano
Up
d
at
e
dra
f
t rele
a
s
e
notes to 1
.
7
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
Ju
n
io
C Hamano
Merge branch 'jn/run-comm
a
nd-
e
rror-fail
u
re'
commit
|
commitdiff
|
tree
2011-05-06
Junio C Hamano
M
e
rge branch
'js/info-man
-
p
a
th'
commit
|
commitdiff
|
tree
2011-05-06
Juni
o
C Hamano
Merge
b
r
anch 'im/hashcmp-optim
'
commit
|
commitdiff
|
tree
2011-05-06
Junio C Haman
o
Mer
g
e
branch 'jk/merge-
o
ne-file-working-tree'
commit
|
commitdiff
|
tree
2011-05-06
Jun
i
o C Hamano
Merge
branch '
j
c
/fix-diff-
f
iles-unmerged'
commit
|
commitdiff
|
tree
2011-05-06
Jun
i
o C Hamano
Merge branch 'cj/p4merge'
commit
|
commitdiff
|
tree
2011-05-06
Junio C Hamano
M
e
rge branch 'g
r
/cvsimp
o
r
t
-a
l
t
ernative-cvspass-loca
t
i
o
n
'
commit
|
commitdiff
|
tree
2011-05-06
J
u
nio C Hamano
M
e
rge bra
n
ch 'sg/
c
omplet
i
on-c
l
eanup'
commit
|
commitdiff
|
tree
2011-05-06
Junio C Hamano
M
erge branch '
j
s/blame-pa
r
sen
a
me
'
commit
|
commitdiff
|
tree
2011-05-06
Junio C Hamano
Merge bra
n
ch 'jk
/
form
a
t-patch-quot
e
-
s
p
e
c
i
al-in-fr
o
m
'
commit
|
commitdiff
|
tree
2011-05-06
J
unio C Ha
m
ano
Merge bran
c
h
'
nd/struct-pathspec'
commit
|
commitdiff
|
tree
2011-05-06
Juni
o
C Hamano
Merge bra
n
ch 'aw/maint-reba
s
e-i-p-
n
o
-ff
'
commit
|
commitdiff
|
tree
2011-05-06
Junio C Hamano
Merge
b
ran
c
h
'
mg/alias-expos
e
-prefix'
commit
|
commitdiff
|
tree
2011-05-06
Junio C H
a
ma
n
o
Merge
b
r
anch 'mg/
d
if
f
-uiconfig-doc'
commit
|
commitdiff
|
tree
2011-05-06
Junio C Hamano
Merge
branch 'mai
n
t'
commit
|
commitdiff
|
tree
2011-05-05
Junio
C
H
a
m
a
n
o
Merge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2011-05-05
Junio
C
Hamano
Merge bran
c
h 'js/maint-1
.
6
.
6-send-pack-stat
e
l
e
ss-
r
pc
.
.
.
commit
|
commitdiff
|
tree
2011-05-05
Juni
o
C
Hamano
t3
7
0
1
: fix here docum
e
nt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-04
Junio C
Ha
m
ano
Up
d
a
t
e draft rel
e
ase
notes to
1
.
7
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-04
Junio C
Hamano
Merge branch 'ml
/
test-readme'
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Mer
g
e branch 'ft
/
gitweb-tar-w
i
th-gzip
-
n'
commit
|
commitdiff
|
tree
2011-05-04
Junio C
Hamano
Merg
e
branch 'mg/re
v
-
l
ist-c
o
unt-cherry'
commit
|
commitdiff
|
tree
2011-05-04
Jun
i
o C Hamano
Merge branc
h
'ss/doc
-
s
v
n'
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge branch
'
jn/f
o
rmat
-
patch
-
doc'
commit
|
commitdiff
|
tree
2011-05-04
Junio C Ha
m
ano
Mer
g
e branc
h
'vr/merge-base-doc'
commit
|
commitdiff
|
tree
2011-05-04
Jun
i
o C Hamano
M
erge branch 'ss/cherr
y
-pick-x-doc'
commit
|
commitdiff
|
tree
2011-05-04
J
u
n
io
C Hamano
Merge bran
c
h
'
jn/maint-format-p
a
tch
-
doc
'
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Me
r
ge branc
h
'j
k
/
forma
t
-patch-multi
l
ine-header'
commit
|
commitdiff
|
tree
2011-05-04
Junio
C Ha
m
a
n
o
Merge branch 'jm/mergetool-su
b
m
odules'
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hama
n
o
Sync
w
ith 1
.
7
.
5
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-04
Junio
C
Hamano
Git 1
.
7
.
5
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-04
J
u
nio C Hamano
Me
r
g
e
bra
n
ch 'jh
/
d
i
rstat' into main
t
commit
|
commitdiff
|
tree
2011-05-04
Junio C
H
am
a
no
Merge
branch
'
s
p/main
t
-
cle
a
r-post
f
ield
s
' into maint
commit
|
commitdiff
|
tree
2011-05-04
J
u
nio C Hamano
Mer
g
e branch 'jk/maint
-
stash-oob'
into maint
commit
|
commitdiff
|
tree
2011-05-04
J
u
nio C
Ha
m
a
n
o
Merg
e
branch 'jk/maint
-
upload-pack-s
h
a
l
low' into mai
n
t
commit
|
commitdiff
|
tree
2011-05-04
Junio C
H
amano
Merg
e
branch
'dm/st
a
s
h-k-
i
-p'
into maint
commit
|
commitdiff
|
tree
2011-05-04
Ju
n
io C Haman
o
M
erge branch
'jc/pack-objects-bigfi
l
e
' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio
C
Hamano
Merge branch 'mg/r
e
flog
-
with-opt
i
ons'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-04
Juni
o
C Hamano
Merge branch 'jk
/
st
a
sh-loos
e
n
-
safety' into maint
commit
|
commitdiff
|
tree
2011-05-04
J
u
nio C Hamano
Merge
b
ranch
'
ar/clean-rmdir-empty' into
maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge branch 'mg/sha1-path-a
d
vis
e
' into
maint
commit
|
commitdiff
|
tree
2011-05-02
Junio C Hamano
Update draft release n
o
tes to 1
.
7
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-02
Ju
n
io C Ham
a
no
Mer
g
e branch 'jk/notes-ui-updates'
commit
|
commitdiff
|
tree
2011-05-02
Junio C Hama
n
o
Merge branch
'
ab/i18n-fi
x
up'
commit
|
commitdiff
|
tree
2011-05-02
Junio C H
a
mano
M
e
rge branch 'nm/s
u
bmodule-u
p
dat
e
-for
c
e'
commit
|
commitdiff
|
tree
2011-05-02
Junio C
H
ama
n
o
Mer
g
e branch
'jh/note
s
-add-ui'
commit
|
commitdiff
|
tree
2011-05-02
J
unio C Hamano
Merge
b
r
anch '
n
d/mai
n
t
-
setup'
commit
|
commitdiff
|
tree
2011-05-02
Juni
o
C Hamano
Me
r
ge branch 'mz
/
maint-rename-u
n
merg
e
d'
commit
|
commitdiff
|
tree
2011-05-01
Junio C
H
a
mano
Upda
t
e
draft releas
e
notes to 1
.
7
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-01
Junio
C Hamano
Merge branch 'r
s
/st
r
buf-setlen-
a
sse
r
t'
commit
|
commitdiff
|
tree
2011-05-01
Junio
C
H
amano
Merge branch 'vh/git
-
svn-doc'
commit
|
commitdiff
|
tree
2011-04-29
J
unio C Ham
a
no
"a
d
d -p": work-aroun
d
an old la
z
iness tha
t
d
oe
s
not
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio
C Ham
a
no
add--interactive
.
perl: fact
o
r ou
t
repeated --
r
ecou
n
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
t
3
701: Editing a sp
l
i
t
hunk i
n
an "add
-p" session
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
J
uni
o
C
Hamano
a
dd -p:
'
q'
should
real
l
y qu
i
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio
C
Hamano
Mer
g
e branch 'maint'
commit
|
commitdiff
|
tree
2011-04-29
Juni
o
C Hama
n
o
St
a
rt 1
.
7
.
5
.
1 ma
i
ntenance t
r
ack
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio C H
a
ma
n
o
M
e
rge
branc
h
'
m
g/x-years-12
-
months' int
o
mai
n
t
commit
|
commitdiff
|
tree
2011-04-28
Junio C Hama
n
o
Merge b
r
anch 'jc/diff-irreversible-delete'
commit
|
commitdiff
|
tree
2011-04-28
Junio C Hamano
Mer
g
e branch 'jc/ren
a
me-degrade-cc-to-c'
commit
|
commitdiff
|
tree
2011-04-28
J
u
n
io C Hamano
Merge branch
'
m
z
/
rebase'
commit
|
commitdiff
|
tree
2011-04-28
Junio C
Hamano
Merg
e
branch 'en
/
merge-r
e
c
u
rs
i
ve'
commit
|
commitdiff
|
tree
2011-04-28
Junio C Ha
m
ano
Merge
bran
c
h
'jh/dirstat'
commit
|
commitdiff
|
tree
2011-04-28
Junio C Ha
m
ano
Merge branch
's
p
/maint-clear
-
post
f
i
eld
s
'
commit
|
commitdiff
|
tree
2011-04-27
Jun
i
o C Hama
n
o
Start 1
.
7
.
6 cycle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-27
Juni
o
C Hamano
Merge b
r
anch 'mg/x-years-12-months'
commit
|
commitdiff
|
tree
2011-04-27
Junio
C
Ham
a
no
Merge branch '
c
n/format-patch-qu
i
et'
commit
|
commitdiff
|
tree
2011-04-27
J
u
ni
o
C Ha
m
an
o
Merge branch 'ef/maint-
s
trb
u
f
-i
n
it'
commit
|
commitdiff
|
tree
2011-04-27
Junio C Haman
o
Merge
branch 'rr/doc-content-type'
commit
|
commitdiff
|
tree
2011-04-27
Junio C H
a
m
ano
Merge bran
c
h 'jc/merge-da
s
h-previous'
commit
|
commitdiff
|
tree
2011-04-27
Junio C Hamano
Merge branch '
d
m
/
s
tash-k-i-p'
commit
|
commitdiff
|
tree
2011-04-27
Jun
i
o C H
a
mano
Merge bran
c
h 'rj/spar
s
e'
commit
|
commitdiff
|
tree
2011-04-27
Ju
n
io C Hama
n
o
Merge
b
ranch 'jk
/
maint
-
upload-pack-shallow'
commit
|
commitdiff
|
tree
2011-04-27
J
u
nio C
H
am
a
no
Merge branch
'nk/
b
lame-abbrev'
commit
|
commitdiff
|
tree
2011-04-27
Junio C Ham
a
no
Merge br
a
nch 'jk/
m
aint-s
t
ash-oob'
commit
|
commitdiff
|
tree
2011-04-27
Junio C Ham
a
no
Merge branch 'dm/color-palette'
commit
|
commitdiff
|
tree
2011-04-27
J
u
nio C Hamano
Merg
e
branch 'j
k
/stash-loosen-saf
e
ty
'
commit
|
commitdiff
|
tree
2011-04-27
J
unio C Hamano
Merge
branch 'jc/pack-ob
j
ects-bigfile'
commit
|
commitdiff
|
tree
2011-04-27
Junio C H
a
m
a
no
Merge b
r
anch
'
mh/git-
s
vn-
a
ut
o
mkdirs'
commit
|
commitdiff
|
tree
2011-04-27
Ju
n
i
o C
H
amano
Merge bran
c
h
'
mg/refl
o
g-w
i
th-options'
commit
|
commitdiff
|
tree
2011-04-27
Junio C Hamano
Mer
g
e br
a
nch
'
ar/clean-rm
d
ir-empty'
commit
|
commitdiff
|
tree
2011-04-27
Junio C
H
amano
Merg
e
br
a
nch 'mg/
s
ha1-path
-
a
d
vise'
commit
|
commitdiff
|
tree
2011-04-26
Junio C Ha
m
ano
http: clear P
O
STFIE
L
DS wh
e
n initializing a slot
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-25
Junio C Ham
a
n
o
Mer
g
e branc
h
'js/
m
ain
t
-
1
.
6
.
6-
s
end-pack-stateless-rpc
.
.
.
commit
|
commitdiff
|
tree
2011-04-24
Ju
n
io C Hamano
G
i
t 1
.
7
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hamano
Fix "ad
d
-u" that sometimes fails
to res
o
l
v
e unmerged
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
J
u
nio C Hamano
diff-files:
s
h
o
w unmerged en
t
ries correctly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hamano
diff: re
m
o
v
e often unu
s
ed parameters from di
f
f_unmer
g
e
()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
J
u
nio
C
Ham
a
n
o
diff
.
c: return filepair from dif
f
_unme
r
ge()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio
C
Hamano
test: use $_z40 fro
m
test-lib
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next