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
Hamano
merge
-
r
e
c
ur
s
ive:
d
o
not return
NUL
L
o
n
ly to cause segfau
l
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Ju
n
io C H
a
man
o
Merge branch
'jc/main
t
-refre
s
h
-
index-is-optional-for
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
am
a
no
G
i
t 1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Ha
m
ano
Me
r
ge
branch 'bg/maint-re
m
ote-update-default'
in
t
o
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Haman
o
Merge bran
c
h 'sb/maint-oc
t
op
u
s' i
n
to
m
a
in
t
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merg
e
branch 'b
g
/maint-add-al
l
-doc'
i
n
t
o maint
commit
|
commitdiff
|
tree
2010-01-20
J
u
n
io C Hamano
Mer
g
e branc
h
'maint
-
1
.
6
.
5' into
main
t
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C Hama
n
o
Git 1
.
6
.
5
.
8
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge b
r
an
c
h 'jk/maint-1
.
6
.
5-res
e
t-hard' into main
t
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
i
o
C H
a
mano
Merge branch 'tr/mai
n
t-1
.
6
.
5-bash-pr
o
mpt-sho
w
-submodule
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o
C
H
a
mano
Merge branch 'dp
/
m
aint-1
.
6
.
5
-fast-import
-
non-co
m
mit
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branc
h
'jm
/
maint-1
.
6
.
5
-gr
e
p-
N
U
L
-
t
erminate' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio
C Hamano
status: don't r
e
quire the repos
i
tory to be
writable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Mer
g
e bran
c
h 'main
t
-1
.
6
.
4'
i
nt
o
maint-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-19
Junio C
H
aman
o
M
er
g
e bra
n
ch 'mai
n
t-1
.
6
.
3'
i
nto
m
aint-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Ju
n
i
o C
H
a
m
ano
Me
r
ge branch 'maint
-
1
.
6
.
2'
into maint-1
.
6
.
3
commit
|
commitdiff
|
tree
2010-01-19
J
unio C Ha
m
ano
Merge c
o
mmit 'v1
.
6
.
4
.
4-8-g8de6518' int
o
maint-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Juni
o
C Hama
n
o
Fix
m
is-backport of t7002
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio C
H
a
m
ano
Upd
a
te
d
raf
t
release notes to 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
b
r
anc
h
'dp/mai
n
t-1
.
6
.
5-fast-import-non-commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
M
e
rg
e
b
ranch 'jm/maint-1
.
6
.
5-g
r
ep-NUL-terminate' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-12
Junio C Ha
m
ano
gre
p
:
-
L sho
u
ld show empty files
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-10
Junio C H
a
ma
n
o
Merg
e
branch
'
maint-1
.
6
.
2' into maint
commit
|
commitdiff
|
tree
2010-01-10
J
un
i
o C Hamano
Me
r
ge
b
ranch 'maint
-
1
.
6
.
1'
i
nto main
t
-1
.
6
.
2
commit
|
commitdiff
|
tree
2010-01-10
J
u
n
i
o C Hamano
Merge branch 'maint-
1
.
6
.
0' into
m
aint-1
.
6
.
1
commit
|
commitdiff
|
tree
2010-01-07
Junio C Hamano
ch
e
ckout -m: do not try to fall back t
o
--merge from
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-31
Junio C
Hama
n
o
Merge branch 'ma
i
nt-1
.
6
.
0'
into ma
i
nt
commit
|
commitdiff
|
tree
2009-12-30
Jun
i
o C Hamano
Merge branch '
m
a
i
nt-1
.
6
.
1' into maint
commit
|
commitdiff
|
tree
2009-12-30
Junio C Hamano
Merge branch 'maint-1
.
6
.
0' into
m
a
i
n
t-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-12-27
Junio
C Hamano
Merge
branch
'
nf/maint
-
fix-
i
ndex-ext-len-on-be
6
4' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-26
J
u
nio C Hamano
Makefile: Fre
e
B
S
D
(
both
7
and
8) need
s
OL
D
_
ICONV
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Junio C Hamano
Start
1
.
6
.
6
.
X mainten
a
nce track
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Jun
i
o C Hamano
Merge b
r
anch 'j
c
/ma
i
nt-obsd46' i
n
to
m
ai
n
t
commit
|
commitdiff
|
tree
2009-12-26
Junio C Hamano
t40
1
9
"gr
e
p" porta
b
ili
t
y
f
ix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Junio C Hama
n
o
t1200: work
a
round
a
bu
g
in some implementations of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-23
Jun
i
o C Ha
m
ano
Git
1
.
6
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-22
Jun
i
o C Hamano
Merge
b
r
a
nch 'maint'
commit
|
commitdiff
|
tree
2009-12-20
J
unio C Hamano
G
i
t 1
.
6
.
6-rc4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-20
Junio C Hamano
M
e
rge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2009-12-16
Jun
i
o
C Hamano
G
i
t
1
.
6
.
6-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
Junio C Hamano
Merge branch
'
mai
n
t' to syn
c
with
1
.
6
.
5
.
7
commit
|
commitdiff
|
tree
2009-12-16
J
unio C H
a
mano
Git 1
.
6
.
5
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
Ju
n
io
C
H
am
a
no
worktree: don't segfault with an
a
bsolute pat
h
s
p
ec
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-11
Junio C Hamano
Update
Release Notes
for 1
.
6
.
6 to
r
emove
old bu
g
fi
x
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-11
Ju
n
i
o
C
Hamano
Sync w
i
th
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
Junio C
Haman
o
Fix archive format
with -- on the
c
ommand line
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
J
u
nio C Haman
o
Remove post-upload-hook
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Junio C Hamano
Gi
t
1
.
6
.
6-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-09
Junio
C Ha
m
ano
M
erge git://
r
epo
.
o
r
.
c
z
/gi
t
-gui
commit
|
commitdiff
|
tree
2009-12-09
Junio
C
Hamano
Me
r
ge git
:
/
/
gi
t
.
k
e
rnel
.
org/pub/
s
cm/gitk/gitk
commit
|
commitdiff
|
tree
2009-12-09
Junio C Ham
a
no
Updat
e
draf
t
rel
e
a
se no
t
es
t
o
1
.
6
.
6
b
e
fore -rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-09
Junio C Ham
a
no
Merge
b
ranch 'maint
'
commit
|
commitdiff
|
tree
2009-12-09
J
u
nio
C Hamano
M
e
rge branch 'mm/ma
i
n
t
-merge-
f
f-erro
r
-
m
essa
g
e-fix'
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
Merge branch 'jn/m
a
int-pull-
r
e
b
ase-erro
r
-mes
s
age
'
into
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
M
erge branc
h
'
j
k/maint-add-p-de
l
et
e
-fix' into maint
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
M
erge git://git
.
b
o
gomip
s
.
or
g
/git-svn
commit
|
commitdiff
|
tree
2009-12-08
Jun
i
o C Ha
m
ano
Revert
r
e
c
ent "git merge <msg> HEAD
<
commit>
.
.
.
"
depre
c
ation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Junio C Ha
m
ano
Sy
n
c 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
Git 1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
Hamano
P
repare for 1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C
Hamano
M
e
rge branch 'uk
/
maint-sho
r
t
l
og-encoding'
i
nto maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Haman
o
M
e
rge branch 'fc/maint-for
m
at-
p
atch-
p
athspe
c
-dash
e
s
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio
C Ha
m
ano
Merge branc
h
'ap/maint-me
r
g
e
-st
r
ategy-list-fix' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C Hamano
Merge
b
r
anch 'jc/maint-
a
m-keep
'
into
m
aint
commit
|
commitdiff
|
tree
2009-12-03
J
unio C Hamano
Merge branch
'
r
s/wo
r
k-around-grep-opt
-
insanity' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io C Ha
m
ano
Merg
e
branch 'rj/maint-cygwin-count-obje
c
ts' into main
t
commit
|
commitdiff
|
tree
2009-12-03
Junio
C Hama
n
o
Merge b
r
a
nch 'mm/maint-h
i
n
t
-failed-m
e
rge' into
maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C
Hamano
Merge branch '
t
h/maint-remote-update-help-string
'
into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ha
m
ano
Merge
b
r
anch 'rj/ma
i
nt-t9700
'
i
nto maint
commit
|
commitdiff
|
tree
2009-12-03
J
un
i
o
C H
a
ma
n
o
Merge bran
c
h
'ls/ma
i
nt-mailinf
o
-no-inbod
y
'
into maint
commit
|
commitdiff
|
tree
2009-12-03
J
unio C Hamano
Mer
g
e branc
h
'mo/mai
n
t-crlf-doc' into maint
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio
C
Ham
a
n
o
Mer
g
e branc
h
'
t
h/remote-usa
g
e
'
i
nto maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merg
e
br
a
n
c
h
'pb/maint
-
u
se-custom-perl'
i
nto ma
i
nt
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge bra
n
c
h 'mm/config-pathnam
e
-tilde-expand'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
amano
Mer
g
e
bra
n
ch
'
bc/g
r
ep-i-F'
i
nto
mai
n
t
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io C
H
a
mano
Merge br
a
nch
'
j
k/maint-break-
r
ename-
r
educe-memory'
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C Hamano
Merge branch 'rj/ma
i
nt
-
s
i
mplify-cygwi
n
-mak
e
file' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C Hama
n
o
Merge branch
'rg/doc-workflo
w
'
i
nto maint
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
Hamano
M
erge branch 'np/ma
i
n
t
-sideband-fa
v
or-status' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
unio C Hamano
Docu
m
entation: xmlt
o
0
.
0
.
18 doe
s
not know --st
r
ingp
a
ram
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io C Ha
m
ano
Merge in 1
.
6
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ham
a
no
Git 1
.
6
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C
H
a
mano
Unco
n
ditio
n
ally set man
.
base
.
url
.
for
.
relati
v
e
.
lin
k
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
Hamano
Merg
e
branch 'maint'
commit
|
commitdiff
|
tree
2009-12-03
J
u
n
io C Hamano
Documentat
i
o
n/Makefi
l
e: a
l
low man
.
base
.
url
.
for
.
rela
t
ive
.
.
.
Signed-off-by:
Junio C Hamano
<junio@kernel.org>
commit
|
commitdiff
|
tree
2009-12-02
Junio C
H
amano
Git 1
.
6
.
6
-rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
Junio C
H
a
mano
M
e
rge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2009-12-02
Junio C
H
ama
n
o
Pr
e
pare f
o
r
1
.
6
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
Junio C Hamano
merge: do not add st
a
ndard message when
m
e
s
sage is
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
Junio
C Ha
m
ano
Do
n
ot mis
i
dentify "git mer
g
e foo HE
A
D" as an
o
ld-style
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
J
unio C Hamano
Update
draft release notes to 1
.
6
.
6 before -rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Junio
C H
a
mano
Merge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2009-12-01
J
un
i
o C Hamano
Me
r
ge bran
c
h 'jc/dep
r
ecate-old-syntax-from-merge'
commit
|
commitdiff
|
tree
2009-12-01
Junio C Hamano
git-mer
g
e
: a depr
e
ca
t
ion notice
o
f the an
c
ient command
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Junio C Hamano
Merge branch
'
b
w/remote-
g
e
t
-
ref-s
t
a
t
e
s
-fix
'
commit
|
commitdiff
|
tree
2009-12-01
Junio C Hamano
M
e
r
g
e branch 'jn/gi
t
web-blame'
commit
|
commitdiff
|
tree
2009-11-30
J
u
nio C Hamano
Merge branch 'fc/m
a
int-
f
or
m
at-patch-path
s
pec-d
a
shes'
commit
|
commitdiff
|
tree
2009-11-30
J
unio C H
a
mano
Merge branch 'm
m
/mai
n
t
-merge-ff-error-m
e
ssage-fix
'
commit
|
commitdiff
|
tree
next