repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
merge-recursive: do not return NULL only to cause segfault
2010-01-22
Junio C H
a
mano
merge-r
e
cursive: do not return
N
U
LL
o
nly
to cause segfault
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-21
Jun
i
o
C
Hamano
Merge branch 'jc/mai
n
t
-refresh-in
d
ex-is-opt
i
onal
-
f
o
r
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Hamano
Git 1
.
6
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Hamano
Merge branch 'b
g
/ma
i
nt-rem
o
t
e
-update
-
default' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Hamano
Merge branch 'sb/maint-oct
o
pus'
into ma
i
nt
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Hamano
Merge branch 'bg/maint-add-all
-
doc'
in
t
o main
t
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merg
e
branch
'mai
n
t-1
.
6
.
5' into maint
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Git 1
.
6
.
5
.
8
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
i
o
C Hama
n
o
Merge branch 'jk/ma
i
nt-1
.
6
.
5
-
reset-hard' into maint
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge br
a
nch 'tr/maint-1
.
6
.
5-bas
h
-p
r
ompt-show-submo
d
ule
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branc
h
'dp/m
a
int-1
.
6
.
5-fast-import-non-c
o
mmit
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Haman
o
Merg
e
b
ranch 'jm
/
main
t
-1
.
6
.
5-grep-NUL-terminat
e
' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
status: don't r
e
quire the
r
epository to be w
r
itable
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio C Hamano
Merge branch 'ma
i
nt-
1
.
6
.
4' into maint-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-19
Junio C Ham
a
no
Merge br
a
nch 'main
t
-1
.
6
.
3
' into maint-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio C Hama
n
o
Mer
g
e br
a
nch
'
mai
n
t-1
.
6
.
2
' into mai
n
t-1
.
6
.
3
commit
|
commitdiff
|
tree
2010-01-19
Junio
C
H
a
mano
M
e
r
ge
commit
'
v
1
.
6
.
4
.
4
-
8-g8de6518' into main
t
-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Junio C H
a
mano
Fix mis-
b
ackport o
f
t
7002
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Junio C
Ha
m
ano
Update draf
t
release
notes
t
o 1
.
6
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
J
unio C Hamano
Merg
e
branc
h
'dp/maint-1
.
6
.
5
-
f
a
st-import-non-commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge bra
n
ch '
j
m/main
t
-1
.
6
.
5-grep-NUL-te
r
minate'
into
.
.
.
commit
|
commitdiff
|
tree
2010-01-12
Junio C
H
amano
grep: -L shou
l
d show
e
mpty files
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-10
J
u
nio C
Hamano
Merge b
r
anch 'ma
i
nt-1
.
6
.
2' into maint
commit
|
commitdiff
|
tree
2010-01-10
Junio C
H
a
mano
Merg
e
branch
'
maint-1
.
6
.
1' into maint-1
.
6
.
2
commit
|
commitdiff
|
tree
2010-01-10
J
unio C Hamano
Merge br
a
nc
h
'main
t
-1
.
6
.
0' into m
a
int-1
.
6
.
1
commit
|
commitdiff
|
tree
2010-01-07
Junio
C
Ha
m
ano
c
h
eckout -m: do not try
to fall back
to --merge from
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-31
J
u
n
i
o C Ham
a
no
M
erge br
a
nch 'maint-1
.
6
.
0' into maint
commit
|
commitdiff
|
tree
2009-12-30
J
uni
o
C Hama
n
o
M
e
rge branch 'maint-1
.
6
.
1'
into maint
commit
|
commitdiff
|
tree
2009-12-30
J
u
nio C Hamano
Merge branch
'
main
t
-1
.
6
.
0' int
o
main
t
-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-12-27
Ju
n
io C Hamano
M
e
r
ge bra
n
ch 'nf/ma
i
nt-fix-index-ext-len-on-b
e
64'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2009-12-26
Jun
i
o C Hamano
Makef
i
le:
F
reeBSD (both 7 and 8) need
s
OLD_ICO
N
V
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
Junio C Ham
a
no
St
a
r
t 1
.
6
.
6
.
X mainten
a
n
ce
t
rack
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
Juni
o
C Hamano
Merg
e
branch 'j
c
/
m
aint-obsd46'
into maint
commit
|
commitdiff
|
tree
2009-12-26
Juni
o
C Haman
o
t4
0
19 "grep
"
portabil
i
ty fix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
Junio C Hamano
t
1
200: wo
r
k around a bug in
some impl
e
mentations of
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-23
Jun
i
o
C
H
amano
Git 1
.
6
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-22
Junio C Ha
m
ano
Merge branch
'maint'
commit
|
commitdiff
|
tree
2009-12-20
J
u
nio C Hamano
Git 1
.
6
.
6-
r
c4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-20
Ju
n
io C
H
ama
n
o
M
erge
bran
c
h
'main
t
'
commit
|
commitdiff
|
tree
2009-12-16
Ju
n
i
o
C
Ham
a
n
o
G
i
t 1
.
6
.
6-rc
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-16
J
unio
C Hamano
M
e
rge b
r
anch 'ma
i
nt'
t
o
sync with 1
.
6
.
5
.
7
commit
|
commitdiff
|
tree
2009-12-16
Juni
o
C Hamano
Git 1
.
6
.
5
.
7
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-16
Junio C
Hamano
wo
r
ktree: don't
seg
f
a
u
lt with
a
n absolute pathsp
e
c
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-11
Juni
o
C Hamano
Update Release Notes for
1
.
6
.
6 to
r
emove old
bugfixes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-11
Junio C Ha
m
ano
S
ync with 1
.
6
.
5
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-10
Junio C Hamano
Git
1
.
6
.
5
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-10
J
unio C Ha
m
ano
Fix
a
rch
i
v
e forma
t
with -- on th
e
c
omma
n
d l
i
n
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-10
Junio C Hamano
Rem
o
ve post-upload-
h
ook
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-10
Junio C Hamano
Git 1
.
6
.
6-rc
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-09
Junio C
H
amano
Merge git://repo
.
or
.
cz/git-gui
commit
|
commitdiff
|
tree
2009-12-09
Junio
C Hama
n
o
Merge git://git
.
ke
r
nel
.
o
rg/pu
b
/
s
cm/gitk/gitk
commit
|
commitdiff
|
tree
2009-12-09
J
unio C Haman
o
Update
draft release
n
otes
t
o 1
.
6
.
6 be
f
ore -rc2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-09
J
u
n
io C
Hamano
Merg
e
branc
h
'maint'
commit
|
commitdiff
|
tree
2009-12-09
Juni
o
C Hamano
Merge
branch '
m
m/
m
ai
n
t-merge-ff-error-message-fi
x
'
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Junio C
H
ama
n
o
Merge branch 'jn/maint-pul
l
-
r
ebas
e
-error-me
s
sa
g
e'
in
t
o
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Junio
C
Hamano
Merg
e
branch 'jk/ma
i
nt-add-p-delete-fix' into maint
commit
|
commitdiff
|
tree
2009-12-09
Ju
n
i
o
C Hamano
Merge git:
/
/git
.
bo
g
o
m
ips
.
or
g
/git-svn
commit
|
commitdiff
|
tree
2009-12-08
J
unio C Hamano
Rev
e
r
t
recent "git
merge
<ms
g
>
HEAD
<
commit>
.
.
.
"
deprecation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-05
Junio C Hama
n
o
Sync wit
h
1
.
6
.
5
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-05
J
u
n
i
o C
Hamano
Git
1
.
6
.
5
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge b
r
anch
'
maint'
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C Ha
m
ano
Prepare fo
r
1
.
6
.
5
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch 'u
k
/maint-sho
r
t
log-encoding' into maint
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o
C Hamano
Merge branch 'fc/main
t
-forma
t
-patch-pathspec-dashes
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
amano
Merge branch 'ap/
m
ain
t
-merge-strategy-list-fix' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Haman
o
Merge branch 'jc/
m
aint-am-k
e
ep'
i
nto ma
i
nt
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch
'
rs/work
-
a
round-g
r
ep-
o
pt-insanit
y
' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C Hamano
Merge bran
c
h
'rj/maint-cygwin-c
o
unt-objects
'
into maint
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C Hamano
Merge br
a
nc
h
'mm/
m
aint
-
h
i
nt-failed-
m
erge'
into
m
aint
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
Haman
o
Merge br
a
n
ch 'th/main
t
-rem
o
te-update-help-
s
tring' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C Hamano
Merg
e
branch 'rj/maint-t9700' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch 'ls
/
maint-mailinfo-no-inb
o
dy' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch 'mo/maint-crlf-doc'
i
nto m
a
i
nt
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C
Ha
m
ano
M
erge bran
c
h
'th/remote-usage' into
ma
i
n
t
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ha
m
ano
Merge bran
c
h
'pb/maint-use
-
custom-perl' i
n
to maint
commit
|
commitdiff
|
tree
2009-12-03
J
u
n
io C
H
amano
Mer
g
e branch 'mm/con
f
ig
-
p
a
thname-t
i
l
de-exp
a
nd' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
amano
Me
r
ge branch 'bc
/
g
r
ep-i-F' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch 'jk/maint-break-rename-reduce-memory'
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
uni
o
C
H
a
m
ano
Merge bran
c
h
'
rj/maint-
s
i
mplify
-
c
y
gw
i
n-makefile'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge b
r
anch 'rg/doc-w
o
rkflow'
into maint
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C Haman
o
Me
r
ge branch 'np/maint-s
i
deband-favor-
s
tatus' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C Hamano
Docume
n
tati
o
n: xmlto 0
.
0
.
18 does not k
n
ow --strin
g
param
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
ama
n
o
Me
r
ge
in 1
.
6
.
5
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C Ham
a
n
o
Git
1
.
6
.
5
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ha
m
a
no
U
nconditionally set
man
.
base
.
url
.
for
.
relative
.
links
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
Juni
o
C Hamano
Git 1
.
6
.
6-rc1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
Junio C Ha
m
an
o
Merge br
a
nch 'maint
'
commit
|
commitdiff
|
tree
2009-12-02
Junio C Hamano
Prepare for
1
.
6
.
5
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
Ju
n
i
o
C
Hamano
merge: d
o
no
t
add standard m
e
ssage when
m
essa
g
e
i
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
Junio
C
Ham
a
no
D
o
n
o
t misidentify "git
m
erge foo HEAD" as an ol
d
-
style
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
Junio C Hamano
Update dr
a
ft release
notes to 1
.
6
.
6 bef
o
re -rc1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
Jun
i
o C
Ham
a
no
Merge branch
'main
t
'
commit
|
commitdiff
|
tree
2009-12-01
Junio C Hamano
Merge bran
c
h 'jc/deprecate
-
old-syn
t
ax-fro
m
-m
e
rge'
commit
|
commitdiff
|
tree
2009-12-01
Junio C Hamano
gi
t
-merge: a depre
c
at
i
on
n
otice of
the ancient co
m
mand
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
Junio C
H
a
m
a
no
M
e
rge branch
'
bw/remote-ge
t
-
r
ef-states-fix'
commit
|
commitdiff
|
tree
2009-12-01
J
u
n
i
o C Hamano
Merge branch 'jn/gitweb
-
blame'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Merge
b
ranc
h
'fc/maint-format-pa
t
ch-pa
t
hsp
e
c
-dashes'
commit
|
commitdiff
|
tree
2009-11-30
J
unio C Hamano
M
erge bran
c
h
'mm/
m
aint
-
merge-ff-error-me
s
sag
e
-fix'
commit
|
commitdiff
|
tree
2009-11-30
Junio C H
a
mano
Merg
e
branc
h
'ap/mai
n
t
-
merge-strategy-list-fix'
commit
|
commitdiff
|
tree
2009-11-30
J
u
nio C Hamano
Merg
e
branch 'jc/pretty-l
f
'
commit
|
commitdiff
|
tree
next
