repo.or.cz
/
git
/
gitweb.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 Hamano
mer
g
e-recursive: do
n
ot r
e
turn NUL
L
only to
c
ause segfault
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-21
J
u
nio C Hamano
Merge branch '
j
c
/maint-refresh-i
n
dex-is-optio
n
al-for
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
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
Merg
e
branch 'b
g
/maint-remote-
u
pdat
e
-defa
u
lt' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Ha
m
a
no
M
erge br
a
nch 'sb/maint-
o
c
topus' into maint
commit
|
commitdiff
|
tree
2010-01-20
Junio C H
a
mano
Merg
e
branch 'bg/maint-
a
dd-all-doc' in
t
o mai
n
t
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Ha
m
ano
Mer
g
e branch 'ma
i
nt-1
.
6
.
5' into maint
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ham
a
no
Git 1
.
6
.
5
.
8
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merg
e
bran
c
h 'jk/maint-1
.
6
.
5-r
e
s
et-hard' into ma
i
n
t
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'tr/maint-1
.
6
.
5-bash-prom
p
t-show-submodule
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Ham
a
no
M
e
rge br
a
nch 'dp/maint
-
1
.
6
.
5-fast-import-non-commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
J
unio C H
a
mano
M
erge branch 'jm/maint
-
1
.
6
.
5-grep
-
NUL-terminate'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C
H
a
m
ano
status: don't require the repository to be writable
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Mer
g
e branch 'maint-1
.
6
.
4' into
maint-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge
branch 'maint-1
.
6
.
3' into maint
-
1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge b
r
a
nch 'maint-1
.
6
.
2
'
into ma
i
nt-1
.
6
.
3
commit
|
commitdiff
|
tree
2010-01-19
Junio C Haman
o
Merg
e
commit 'v
1
.
6
.
4
.
4-8
-
g
8
de6518'
into main
t
-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Juni
o
C Hamano
F
ix
m
is-backport
o
f t7002
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Juni
o
C Hamano
Update draft releas
e
n
otes to
1
.
6
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Junio
C Hamano
M
e
rge b
r
anc
h
'dp/ma
i
n
t-1
.
6
.
5
-
f
ast-import-non
-
commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merg
e
b
ranch 'jm/m
a
int-1
.
6
.
5-grep-N
U
L-term
i
n
a
te'
into
.
.
.
commit
|
commitdiff
|
tree
2010-01-12
Junio C Hama
n
o
grep: -L should show emp
t
y fil
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-10
J
u
nio
C
Hamano
Merge branch 'mai
n
t-1
.
6
.
2' into mai
n
t
commit
|
commitdiff
|
tree
2010-01-10
J
u
ni
o
C Hamano
Merge branch
'
maint-1
.
6
.
1'
into maint-1
.
6
.
2
commit
|
commitdiff
|
tree
2010-01-10
Junio C Hamano
Merge branch 'maint-1
.
6
.
0' into maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2010-01-07
Junio
C
Hamano
checkout -m:
do no
t
try to fall back to --merge fr
o
m
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-31
Junio C
H
a
mano
Merg
e
branch 'maint-1
.
6
.
0' in
t
o ma
i
nt
commit
|
commitdiff
|
tree
2009-12-30
Junio C
Hamano
Mer
g
e bra
n
ch 'm
a
int-
1
.
6
.
1' in
t
o maint
commit
|
commitdiff
|
tree
2009-12-30
Junio C Hamano
Merge
b
ranch 'maint-1
.
6
.
0'
into maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-12-27
Junio
C Ha
m
ano
Merge b
r
a
n
c
h
'
nf/maint-fix-in
d
ex-ext-l
e
n-o
n
-be64' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-26
Jun
i
o C Hama
n
o
M
akefile: FreeBSD (both 7 and 8) nee
d
s
O
L
D
_
I
CONV
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
J
u
nio
C Hamano
Start
1
.
6
.
6
.
X maintenance tra
c
k
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
J
uni
o
C
Hama
n
o
Merge branch '
j
c/main
t
-obsd46' into main
t
commit
|
commitdiff
|
tree
2009-12-26
Junio
C
Hamano
t4019 "
g
rep" portabi
l
i
ty
fi
x
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
Ju
n
i
o C Hamano
t
1200:
work around a bug in some i
m
plementations of
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-23
Jun
i
o
C Hamano
Git 1
.
6
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-22
J
unio C Hamano
Merge
branch
'
ma
i
nt'
commit
|
commitdiff
|
tree
2009-12-20
Ju
n
io C Hamano
Git 1
.
6
.
6-rc4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-20
Ju
n
io C Hamano
Merge branch
'maint'
commit
|
commitdiff
|
tree
2009-12-16
Junio C Hamano
Git 1
.
6
.
6-rc3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-16
Ju
n
i
o C Hamano
Me
r
ge
bra
n
c
h 'm
a
int' to
s
y
n
c
w
ith
1
.
6
.
5
.
7
commit
|
commitdiff
|
tree
2009-12-16
J
u
n
i
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
worktree:
don't
s
eg
f
ault with an absolu
t
e paths
p
ec
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-11
Jun
i
o
C Haman
o
Upda
t
e Release Notes for 1
.
6
.
6
to remo
v
e old bu
g
fixes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-11
Ju
n
i
o C Hamano
Sy
n
c w
i
th 1
.
6
.
5
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-10
J
u
n
io C Haman
o
G
it 1
.
6
.
5
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-10
Junio C H
a
m
ano
Fix archive forma
t
with -- on
t
he c
o
mmand line
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-10
Junio C Hamano
Remove post-upload-hoo
k
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-10
J
uni
o
C
Haman
o
G
it 1
.
6
.
6-rc2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-09
Junio
C Hamano
Me
r
ge
git://repo
.
or
.
cz/git-gui
commit
|
commitdiff
|
tree
2009-12-09
Junio C H
a
mano
Merg
e
git:/
/
git
.
k
ernel
.
org/p
u
b
/scm
/
g
i
tk/gi
t
k
commit
|
commitdiff
|
tree
2009-12-09
Ju
n
io C Haman
o
Update
draft
re
l
eas
e
notes
t
o
1
.
6
.
6 bef
o
re -
r
c
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-09
J
u
nio C Hamano
Mer
g
e
branch
'
maint'
commit
|
commitdiff
|
tree
2009-12-09
Juni
o
C Hama
n
o
Merge branch 'mm
/
maint-me
r
ge-ff-e
r
ror-message-fix'
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
Merge br
a
nch
'
jn
/
maint-pull-r
e
b
ase-err
o
r
-
m
ess
a
ge' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
J
u
nio C Hamano
M
erg
e
branch 'jk/mai
n
t
-
ad
d
-p-delete-f
i
x' i
n
to maint
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hama
n
o
M
erge git
:
/
/git
.
bogomips
.
or
g
/gi
t
-svn
commit
|
commitdiff
|
tree
2009-12-08
Junio C H
a
mano
Revert re
c
ent "git mer
g
e <msg> HEAD <commi
t
>
.
.
.
" deprecation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-05
Ju
n
io C Hama
n
o
Sync with 1
.
6
.
5
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-05
Ju
n
io
C
Hamano
G
it 1
.
6
.
5
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
J
unio C
Hamano
Merge bran
c
h 'mai
n
t'
commit
|
commitdiff
|
tree
2009-12-03
J
unio C
Hamano
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 br
a
nch 'uk/maint-
s
hortlo
g
-encoding'
into maint
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io
C
Hama
n
o
Merge branch 'fc/
m
aint-form
a
t
-patch-p
a
thspec-dashes
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branc
h
'a
p
/
ma
i
n
t
-merge-strategy-list-fi
x
' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io C
H
amano
M
e
rge branch 'jc/maint-am-kee
p
' into maint
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C Hamano
M
erge
b
ranch '
r
s/work-
a
r
ound-grep
-
o
pt-insan
i
ty'
into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
unio C Hamano
Merge
branch 'rj/maint-cygwin-
c
ou
n
t-objects
'
into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch '
m
m/maint
-
hint-failed-merge' into maint
commit
|
commitdiff
|
tree
2009-12-03
J
unio C
Haman
o
Merge branch 't
h
/maint
-
remote-update-help-string' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Haman
o
M
e
rge br
a
nch
'
rj/m
a
int
-
t9700' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge
b
ranch 'ls/m
a
int
-
mailinfo-no-inbo
d
y' into
m
aint
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C Ha
m
an
o
Me
r
ge
b
ranch 'mo/mai
n
t-crlf-
d
oc'
i
nto maint
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io C Hama
n
o
Mer
g
e
b
ranch 'th/remote-usa
g
e' into m
a
i
nt
commit
|
commitdiff
|
tree
2009-12-03
J
u
n
io C Hamano
Me
r
ge branch '
p
b/maint-use-custom-perl' into
main
t
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
Hamano
Merg
e
b
r
a
n
ch
'mm/config-pa
t
h
n
ame
-
til
d
e-expand
'
into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge
b
ran
c
h 'bc/gr
e
p
-i-F' into maint
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C Hamano
Merge branch
'
jk/maint-bre
a
k-rename-reduce-memo
r
y
'
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C
Hamano
Merge b
r
anc
h
'rj/maint
-
s
imp
l
ify-cygwin-makefile' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
unio C Ham
a
n
o
Merge branc
h
'rg/doc-workflow'
i
nto maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
M
e
rge branch 'np/main
t
-
s
i
deb
a
n
d-f
a
v
o
r-status' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Documentation
:
xmlto
0
.
0
.
18 does
n
o
t
kn
o
w
-
-
stringparam
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio
C
Hamano
Merg
e
in 1
.
6
.
5
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
J
u
n
i
o C Haman
o
Git 1
.
6
.
5
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ham
a
no
Uncon
d
itiona
l
l
y
s
et man
.
base
.
url
.
for
.
relat
i
ve
.
l
i
nks
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
J
unio C
H
a
mano
Merg
e
br
a
n
c
h 'ma
i
nt'
commit
|
commitdiff
|
tree
2009-12-02
Junio C Ha
m
ano
Prepar
e
f
or 1
.
6
.
5
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
Junio C Hamano
merg
e
: do not add standard message wh
e
n message is
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
Junio C Ham
a
no
Do not m
i
sid
e
ntify "
g
it me
r
g
e
foo
HE
A
D" as a
n
old-sty
l
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
Junio
C
Hamano
Update
d
raft release no
t
es to 1
.
6
.
6 before
-r
c
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
Ju
n
io C Ha
m
ano
M
e
rge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2009-12-01
Junio
C
H
a
man
o
Merge branch 'jc/deprecate
-
old-syntax-f
r
om-merge'
commit
|
commitdiff
|
tree
2009-12-01
Junio
C
Hamano
git-
m
erge: a depre
c
ation notice of th
e
ancient
comman
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
Junio C Hamano
Merge bra
n
c
h
'bw/remote-get-ref-states-fix'
commit
|
commitdiff
|
tree
2009-12-01
Junio
C
Haman
o
M
erge branch
'
jn
/
gitw
e
b-blame'
commit
|
commitdiff
|
tree
2009-11-30
J
u
nio C Hamano
Merge bra
n
ch
'
fc
/
maint-fo
r
mat-pa
t
ch-path
s
pec-dashes
'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Ham
a
no
Merge
branc
h
'
m
m/maint
-
merge-
f
f-er
r
or-message-fi
x
'
commit
|
commitdiff
|
tree
2009-11-30
Junio C
H
aman
o
M
e
rge branch 'ap/maint-merge
-
st
r
ateg
y
-list
-
fix'
commit
|
commitdiff
|
tree
2009-11-30
Ju
n
io C H
a
man
o
Merge b
r
anch
'jc
/
pre
t
ty-lf'
commit
|
commitdiff
|
tree
next