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
Juni
o
C Hamano
merge-r
e
cursive: do not return NULL only to
cause segfault
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Junio C
Hamano
M
erge branch
'
jc/maint-refresh
-
i
ndex-i
s
-optional-for
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C H
a
man
o
Git 1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Mer
g
e branch 'bg/maint-
r
emote-update-default
'
in
t
o
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Hamano
Merge
b
r
anch 'sb/maint
-
oc
t
o
pus'
into
m
aint
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Hamano
Merge branch 'bg/maint-ad
d
-all-doc' into maint
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge bran
c
h
'
m
aint-1
.
6
.
5' i
n
to
m
a
int
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
J
unio C Ha
m
ano
Me
r
ge branch '
j
k/m
a
int-1
.
6
.
5-rese
t
-hard
'
into main
t
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge br
a
n
c
h 'tr/maint-1
.
6
.
5
-
bash
-
pr
o
mp
t
-show-submodule
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Me
r
ge branc
h
'dp
/
maint-1
.
6
.
5-fast-import-n
o
n-commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Me
r
ge branch 'jm/maint
-
1
.
6
.
5
-
g
rep
-
N
U
L
-
t
e
rminate' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
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
M
erge
branc
h
'maint-1
.
6
.
4' int
o
maint-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio C Haman
o
Merge branch 'main
t
-
1
.
6
.
3' into maint-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
J
unio C Hamano
Merge
branch 'm
a
i
nt-1
.
6
.
2' into maint-1
.
6
.
3
commit
|
commitdiff
|
tree
2010-01-19
Juni
o
C Hamano
Merg
e
co
m
mit 'v1
.
6
.
4
.
4-8-g8de6
5
18'
i
n
t
o main
t
-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Fi
x
mis-b
a
ck
p
ort of t7
0
0
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Juni
o
C H
a
m
a
n
o
U
pdate draf
t
releas
e
notes
t
o 1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Juni
o
C
Hamano
Merg
e
bra
n
c
h
'dp/maint-1
.
6
.
5-fast-import
-
non-comm
i
t
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio C H
a
mano
Merge branch 'jm/maint-1
.
6
.
5-gre
p
-NU
L
-term
i
nate'
into
.
.
.
commit
|
commitdiff
|
tree
2010-01-12
Ju
n
io C Ha
m
ano
gr
e
p:
-
L s
h
ould s
h
o
w
e
mpty f
i
l
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-10
Junio C Hamano
M
erge branch 'mai
n
t
-1
.
6
.
2' into maint
commit
|
commitdiff
|
tree
2010-01-10
Junio C Hamano
Merge branch 'maint-1
.
6
.
1' into
m
aint
-
1
.
6
.
2
commit
|
commitdiff
|
tree
2010-01-10
Junio C H
a
mano
M
erge
b
ranch 'm
a
in
t
-
1
.
6
.
0' into m
a
int-1
.
6
.
1
commit
|
commitdiff
|
tree
2010-01-07
J
u
nio C Hamano
checkout -m: do not
t
ry to fall back to --me
r
ge from
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-31
Ju
n
io C H
a
mano
Merge branch 'mai
n
t
-
1
.
6
.
0' into maint
commit
|
commitdiff
|
tree
2009-12-30
J
unio C Hamano
Merge
b
ranch '
m
aint
-
1
.
6
.
1' into maint
commit
|
commitdiff
|
tree
2009-12-30
J
u
nio C Hama
n
o
Me
r
ge
b
ranch 'mai
n
t-1
.
6
.
0' in
t
o maint
-
1
.
6
.
1
commit
|
commitdiff
|
tree
2009-12-27
Junio C Hamano
Merg
e
branch 'nf/maint-fix-index-ext-len-on
-
be64'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2009-12-26
Junio C Hama
n
o
Makefile: Fre
e
B
S
D (both 7 a
n
d 8
)
need
s
OLD_I
C
ONV
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Junio C Hamano
Start 1
.
6
.
6
.
X maint
e
n
ance track
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Junio C Hamano
Merge br
a
nch
'jc/maint-obsd46' into maint
commit
|
commitdiff
|
tree
2009-12-26
Junio C
H
a
mano
t4019
"
g
r
ep" portabili
t
y fix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
J
uni
o
C Hamano
t12
0
0: work
around a bu
g
in some implementations
o
f
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-23
Junio C Hamano
Git 1
.
6
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-22
Junio
C
Hamano
M
e
rge
b
ranc
h
'maint'
commit
|
commitdiff
|
tree
2009-12-20
Juni
o
C Hama
n
o
Gi
t
1
.
6
.
6-r
c
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-20
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2009-12-16
J
u
nio C
H
amano
Git 1
.
6
.
6-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
J
u
n
i
o C Hamano
Merge bra
n
ch
'maint'
to sync with 1
.
6
.
5
.
7
commit
|
commitdiff
|
tree
2009-12-16
Junio
C Hamano
Gi
t
1
.
6
.
5
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
Junio C
H
amano
wo
r
kt
r
e
e: don't se
g
fault w
i
th
an
a
bsolute pathspec
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-11
Junio C H
a
m
ano
Update Re
l
e
a
se No
t
es for 1
.
6
.
6
t
o remove old bugfixes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-11
J
u
n
io C Hama
n
o
S
y
n
c 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
Junio C Ha
m
a
n
o
Fix archive format with -- on
t
he command line
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Junio C Ham
a
no
R
emove post-upload-hook
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Junio C Hamano
Git
1
.
6
.
6-r
c
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-09
J
u
nio C
H
amano
Me
r
g
e
g
i
t://repo
.
or
.
cz/git
-
gui
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
Merge git://git
.
k
ernel
.
org
/
pub/
s
c
m/gi
t
k/g
i
tk
commit
|
commitdiff
|
tree
2009-12-09
J
unio C Haman
o
Update d
r
a
f
t release n
o
tes to 1
.
6
.
6 befor
e
-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-09
Junio
C Ha
m
ano
M
erge branc
h
'mai
n
t'
commit
|
commitdiff
|
tree
2009-12-09
Junio
C
Ham
a
no
M
e
rge branc
h
'
mm/ma
i
nt-
m
erge-ff-error-message-fix'
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
Mer
g
e
br
a
nch '
j
n/mai
n
t-pull-rebase-
e
rror
-
message'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Junio C Ham
a
no
Merge branc
h
'jk/maint-ad
d
-p-
d
elete-fix' into maint
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
Merge git://g
i
t
.
bo
g
omips
.
o
r
g/git-s
v
n
commit
|
commitdiff
|
tree
2009-12-08
Junio C Hamano
Rev
e
rt recent
"git
m
erge <ms
g
>
H
EAD <commit>
.
.
.
" depreca
t
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Junio
C
Hamano
Syn
c
with 1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Junio C Haman
o
G
it 1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
Haman
o
Me
r
g
e
branch 'maint'
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hama
n
o
Prepare for 1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
M
erge bra
n
ch 'uk/mai
n
t-shortlog-encoding' into
m
aint
commit
|
commitdiff
|
tree
2009-12-03
J
un
i
o C Hamano
Mer
g
e branch 'f
c
/
m
aint-format-patch-pathsp
e
c-dash
e
s
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch 'ap/maint
-
merge
-
strategy-list-fix' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
Hamano
Merge branch 'jc/mai
n
t
-
am-keep' into main
t
commit
|
commitdiff
|
tree
2009-12-03
J
uni
o
C Hamano
Merge branch 'r
s
/wo
r
k-around-grep
-
opt-insanity' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
uni
o
C Hamano
M
e
r
g
e bra
n
c
h 'rj/ma
i
nt-cygwin-count-o
b
ject
s
' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio
C Ha
m
ano
Merge branch
'
mm/ma
i
nt-hint-failed-mer
g
e
' into
m
aint
commit
|
commitdiff
|
tree
2009-12-03
Junio
C Hama
n
o
Merge branc
h
'th
/
maint-remote-up
d
ate-h
e
lp-str
i
ng' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
am
a
no
Merge branc
h
'r
j
/maint-t9
7
0
0
'
into maint
commit
|
commitdiff
|
tree
2009-12-03
J
uni
o
C Haman
o
Merge br
a
n
ch 'ls/maint-mail
i
nfo-no-
i
nbody
'
into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
amano
Merge bra
n
ch 'mo/ma
i
nt
-
crlf-doc' into
m
ai
n
t
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
i
o
C Ham
a
n
o
Merge branch 'th/remote-usage'
i
nto maint
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io C Hamano
Merge branch 'p
b
/main
t
-use-custom-perl'
in
t
o
m
a
int
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C Hamano
Merge branch 'mm/config-pathn
a
me-
t
ilde-expand'
i
n
to
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
am
a
no
Merge bra
n
ch
'
bc/grep-i-F' int
o
main
t
commit
|
commitdiff
|
tree
2009-12-03
J
u
ni
o
C
H
amano
Merge
branch 'jk
/
maint-
b
reak-
r
en
a
me-reduce-memory
'
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge bran
c
h '
r
j/maint-simplify-cygwin-makefile' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C H
a
mano
M
erge branch 'r
g
/doc-workflow' i
n
to
maint
commit
|
commitdiff
|
tree
2009-12-03
J
unio C Hamano
Merge branch
'
np/maint-s
i
deban
d
-favor-status' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
D
o
c
umentation: xml
t
o 0
.
0
.
18 does not know --str
i
ngparam
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
J
u
n
io C Hamano
Merge in 1
.
6
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C Ham
a
no
Git 1
.
6
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hama
n
o
U
nconditionally
set m
a
n
.
base
.
url
.
for
.
rel
a
tiv
e
.
links
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
J
unio C
H
amano
Mer
g
e
bran
c
h 'ma
i
nt'
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Docu
m
entat
i
o
n/Makefi
l
e
: allow man
.
base
.
url
.
for
.
relative
.
.
.
Signed-off-by:
Junio C Hamano
<junio@kernel.org>
commit
|
commitdiff
|
tree
2009-12-02
Junio C Hamano
Git 1
.
6
.
6-rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
Junio C
Hamano
Mer
g
e branch 'maint'
commit
|
commitdiff
|
tree
2009-12-02
Junio C Ham
a
no
Pre
p
are for 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 standard me
s
sage
w
h
e
n m
e
ssage
i
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
Jun
i
o C Hamano
D
o
not
m
is
i
dentify "git merge fo
o
H
E
AD" as an old-s
t
yle
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Junio C Ham
a
no
Upd
a
t
e d
r
aft relea
s
e notes to 1
.
6
.
6
b
efo
r
e -rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
J
u
n
i
o
C
Haman
o
Merge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2009-12-01
J
unio C Hamano
Mer
g
e branch 'jc/de
p
rec
a
te-old-syntax
-
f
ro
m
-merge'
commit
|
commitdiff
|
tree
2009-12-01
Junio
C
Hamano
git
-
mer
g
e:
a
deprecation notice of the a
n
cie
n
t command
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Jun
i
o C
Hamano
M
er
g
e branch 'bw/remote-get-r
e
f
-
states-fix'
commit
|
commitdiff
|
tree
2009-12-01
Junio C Hamano
Mer
g
e branc
h
'jn/gitw
e
b-blam
e
'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Haman
o
Merge
bra
n
c
h
'
f
c/ma
i
nt-format-patch-pathspec-dash
e
s'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Ha
m
an
o
Merge bra
n
ch 'mm/
m
ain
t
-me
r
ge
-
ff-err
o
r-message-fix'
commit
|
commitdiff
|
tree
next