repo.or.cz
/
git
/
mingw.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 Haman
o
merge-recursi
v
e:
do no
t
return
NULL only to cause segfault
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Mer
g
e branch 'jc/maint-refresh-index
-
is-optional
-
fo
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
Ju
n
i
o C Hamano
Merge bran
c
h '
b
g/main
t
-remote-upd
a
te
-
defa
u
lt' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C H
a
mano
M
erge branch 'sb/maint-octopus' into mai
n
t
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C Ham
a
no
Merge bran
c
h 'bg/maint-add
-
all-doc' into maint
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Ha
m
a
n
o
Mer
g
e branch
'
maint-1
.
6
.
5' into maint
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Hama
n
o
G
i
t
1
.
6
.
5
.
8
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C Ha
m
ano
Merge branch 'jk/main
t
-1
.
6
.
5-reset-ha
r
d' into main
t
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Mer
g
e b
r
anch
'tr/main
t
-1
.
6
.
5-ba
s
h-prompt-show-submod
u
l
e
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Mer
g
e branch 'dp/maint-
1
.
6
.
5-fast-
i
m
port-non-commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C H
a
m
ano
Merge branch
'
jm/main
t
-1
.
6
.
5-grep-NUL
-
t
e
rminate' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ha
m
ano
status: don't requi
r
e t
h
e
r
e
pository
t
o be writable
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Ha
m
ano
Merge bra
n
ch '
m
aint-1
.
6
.
4' in
t
o
m
aint-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-19
Junio C Ham
a
no
M
er
g
e b
r
anch 'm
a
int-1
.
6
.
3' into maint-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Ju
n
io
C
Hamano
Merge branch 'maint-1
.
6
.
2' in
t
o mai
n
t-1
.
6
.
3
commit
|
commitdiff
|
tree
2010-01-19
J
u
n
i
o C Hamano
Mer
g
e commit 'v
1
.
6
.
4
.
4-8-g8de
6
518
'
into maint-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Junio C H
a
mano
Fix mis-b
a
ckpo
r
t of t70
0
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio
C
Hamano
Upda
t
e draft release notes to 1
.
6
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
J
uni
o
C Haman
o
Merge
branch 'dp/maint-1
.
6
.
5-fast-import-non-commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Ju
n
io C Ha
m
ano
M
e
rge branch 'jm/maint-1
.
6
.
5-grep-NUL-terminate
'
into
.
.
.
commit
|
commitdiff
|
tree
2010-01-12
J
unio
C
H
amano
grep: -L sh
o
ul
d
sho
w
empty files
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-10
Jun
i
o C Hamano
Merge br
a
nch 'maint-1
.
6
.
2' into maint
commit
|
commitdiff
|
tree
2010-01-10
Junio C Ham
a
no
Merge
b
ranch '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 mai
n
t-1
.
6
.
1
commit
|
commitdiff
|
tree
2010-01-07
Junio C Hamano
checkout -m: do not try to fall bac
k
to
--merge from
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-31
Junio C
H
a
m
a
no
M
erge branch 'maint
-
1
.
6
.
0
'
into maint
commit
|
commitdiff
|
tree
2009-12-30
Junio C Hamano
M
e
r
ge branch 'ma
i
nt-1
.
6
.
1' into main
t
commit
|
commitdiff
|
tree
2009-12-30
Junio C
Ha
m
a
n
o
Merge branch 'maint-1
.
6
.
0' into ma
i
nt-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-12-27
Junio C
H
aman
o
Merge branch 'nf/
m
aint-fix
-
ind
e
x
-e
x
t-len-on-be64
'
into
.
.
.
commit
|
commitdiff
|
tree
2009-12-26
Junio C
Hamano
Makefi
l
e: FreeBSD
(bot
h
7 and 8) needs OLD_ICONV
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
J
unio C Ha
m
ano
Start 1
.
6
.
6
.
X mainte
n
a
nce track
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
Junio
C Hamano
Merge
b
ran
c
h 'jc/ma
i
nt-obsd46' into maint
commit
|
commitdiff
|
tree
2009-12-26
Junio C
Hamano
t
4019
"grep
"
portability fix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
Juni
o
C Hamano
t1200:
w
o
rk arou
n
d
a
bug in
s
ome imp
l
ementat
i
ons of
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-23
Junio C H
a
m
a
n
o
Git 1
.
6
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-22
Junio C Ham
a
n
o
Merge branch 'maint
'
commit
|
commitdiff
|
tree
2009-12-20
Junio C
Hamano
Git
1
.
6
.
6-rc4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-20
Junio C H
a
mano
Merge bran
c
h
'
maint'
commit
|
commitdiff
|
tree
2009-12-16
J
u
nio C Haman
o
Gi
t
1
.
6
.
6
-
rc3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-16
Junio C Hamano
Mer
g
e b
r
a
n
ch 'maint' to s
y
n
c
with
1
.
6
.
5
.
7
commit
|
commitdiff
|
tree
2009-12-16
Junio C Ha
m
ano
Git 1
.
6
.
5
.
7
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-16
Ju
n
io C Haman
o
worktree: d
o
n
'
t
segfault wit
h
a
n
a
b
sol
u
te pathspec
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-11
Junio
C Hamano
Update Release Notes fo
r
1
.
6
.
6
t
o r
e
move old
b
u
gfixes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-11
J
u
nio
C
Hamano
Syn
c
with
1
.
6
.
5
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-10
Junio C Ham
a
no
Git 1
.
6
.
5
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-10
Junio
C
Hamano
Fix archive format
w
ith -- on the c
o
mmand line
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-10
J
unio
C
H
amano
Remov
e
post-uploa
d
-hook
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-10
Junio C Hamano
G
i
t 1
.
6
.
6
-
rc2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
Mer
g
e
git:/
/
rep
o
.
o
r
.
cz/git-gui
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hama
n
o
Merge
git://git
.
kernel
.
or
g
/pub/scm/gitk/
g
i
tk
commit
|
commitdiff
|
tree
2009-12-09
J
unio
C Hamano
Update dra
f
t release
notes to
1
.
6
.
6 before -rc2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-09
Junio
C
Ham
a
no
Merge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2009-12-09
Junio C Haman
o
Me
r
ge branch 'mm/maint-merge
-
f
f-error-message-f
i
x'
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Junio C Ha
m
ano
Merge branch 'jn/maint-pull-
r
e
b
a
s
e-error
-
mes
s
a
g
e' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
Merge branch 'jk/ma
i
nt-add-
p
-
d
ele
t
e-f
i
x' into
maint
commit
|
commitdiff
|
tree
2009-12-09
Jun
i
o C
Haman
o
Merge git:
/
/git
.
b
o
gomips
.
org/
g
it-sv
n
commit
|
commitdiff
|
tree
2009-12-08
Junio
C
H
amano
Rev
e
r
t
rece
n
t "git m
e
rge <msg
>
HEAD <commit>
.
.
.
" deprecation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-05
Jun
i
o C Ha
m
ano
S
ync with 1
.
6
.
5
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-05
J
u
nio
C
Hama
n
o
Git
1
.
6
.
5
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
J
unio C Hamano
Merge branc
h
'maint'
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C Hamano
P
repare for 1
.
6
.
5
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C
H
amano
Merge branc
h
'uk/maint-shortlog
-
encodin
g
'
into mai
n
t
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ha
m
ano
M
erg
e
branch 'fc/maint-format-
p
atch
-
pathsp
e
c-dashes
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio
C Hamano
Merge branch 'ap/mai
n
t-merge-strateg
y
-list-fix' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hama
n
o
Merge branch
'jc/maint-
a
m
-keep' into mai
n
t
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Me
r
ge branch
'
rs/
w
ork-around-grep
-
opt-insani
t
y
' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge
branch 'rj/maint-
c
ygwin-co
u
nt-objects' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
H
a
man
o
Merge branch 'mm/maint-hint-failed-m
e
rge' into mai
n
t
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio
C
Ha
m
ano
Merge branch
'
th/maint-remote-update-help-
s
tring' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C
Hamano
Merge
b
ranch 'rj/mai
n
t-t9700' i
n
to main
t
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C Haman
o
Mer
g
e branch 'ls/maint-m
a
ilinfo-n
o
-inbo
d
y' into
m
aint
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
Hamano
Merge branch 'mo/
m
aint-c
r
l
f
-
doc'
into mai
n
t
commit
|
commitdiff
|
tree
2009-12-03
Junio
C Hamano
Merge
branch 'th/remote-usage' into ma
i
nt
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch 'pb/maint-u
s
e-cust
o
m-pe
r
l' into maint
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C
H
a
man
o
Merge branch
'mm
/
config-pathname-
t
ilde-expa
n
d'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
amano
Merge bra
n
ch
'
bc/grep
-
i-F' into m
a
i
n
t
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C Hamano
Mer
g
e
b
r
an
c
h 'jk
/
maint-br
e
ak-rename-reduce-me
m
ory'
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio
C Hamano
Merge br
a
nch 'rj
/
maint-simplify-cygwin-makefil
e
' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
amano
Merge branch
'
r
g/doc-workflow
'
into
ma
i
nt
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C Hamano
M
e
rge
b
ranch 'np/ma
i
nt-s
i
deband
-
favor-status'
into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hama
n
o
Documentatio
n
: xmlt
o
0
.
0
.
18 does not kno
w
--s
t
ringparam
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge
i
n
1
.
6
.
5
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
a
m
a
n
o
G
i
t 1
.
6
.
5
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
i
o
C Hamano
U
n
co
n
ditio
n
ally se
t
man
.
base
.
url
.
for
.
relativ
e
.
links
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
Ju
n
io C Hamano
Git
1
.
6
.
6-
r
c1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
Junio C
Hamano
Merge
br
a
nch 'maint'
commit
|
commitdiff
|
tree
2009-12-02
Juni
o
C Hamano
Pre
p
are for 1
.
6
.
5
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
Juni
o
C Hamano
m
e
r
g
e: do not add st
a
n
dard message when message is
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
J
unio C
H
amano
Do n
o
t
m
isidenti
f
y
"
git merge
foo HEAD" as an old-style
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
Junio C Ha
m
ano
Up
d
at
e
draft release notes to 1
.
6
.
6 before -rc1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
Ju
n
io C Ha
m
ano
M
e
rg
e
branch 'maint'
commit
|
commitdiff
|
tree
2009-12-01
J
u
ni
o
C Hamano
Merge
b
ranch 'jc/deprecat
e
-old-syntax-from-merge'
commit
|
commitdiff
|
tree
2009-12-01
Junio C Hamano
git
-
m
e
rg
e
:
a deprecation noti
c
e
of the ancient c
o
mmand
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
Junio C
H
amano
Merge branc
h
'bw/re
m
ote-get-ref-states-fix'
commit
|
commitdiff
|
tree
2009-12-01
Junio
C Hamano
Merg
e
branch 'j
n
/g
i
tweb-bl
a
m
e
'
commit
|
commitdiff
|
tree
2009-11-30
Junio
C
H
a
mano
Merge bra
n
ch 'fc/maint-form
a
t
-pa
t
ch-pathspec-dashes'
commit
|
commitdiff
|
tree
2009-11-30
Junio
C
H
a
mano
Merge bra
n
ch 'mm/
m
aint-merge-f
f
-e
r
ror-message-fix'
commit
|
commitdiff
|
tree
2009-11-30
Junio C
H
amano
Me
r
g
e
b
r
a
nch 'ap/maint-merg
e
-str
a
tegy-list-fix'
commit
|
commitdiff
|
tree
2009-11-30
Junio C
Hama
n
o
M
erge bran
c
h 'jc/
p
r
etty-lf'
commit
|
commitdiff
|
tree
next