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: demonstrate an incorrect conflict with submodule
2010-06-08
Junio
C Ha
m
an
o
Merge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2010-06-07
Junio C Hama
n
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-06-07
Junio C Hamano
Merge branch 'maint
'
commit
|
commitdiff
|
tree
2010-06-02
Junio C Hama
n
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-06-01
Junio C Hamano
Merg
e
branch 'maint'
commit
|
commitdiff
|
tree
2010-06-01
Junio
C Ha
m
a
n
o
Merge branch 'maint-1
.
7
.
0' into main
t
commit
|
commitdiff
|
tree
2010-05-28
Ju
n
i
o
C
Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-05-28
Junio C Hamano
Merge branc
h
'maint-1
.
7
.
0
' into
main
t
commit
|
commitdiff
|
tree
2010-05-25
Junio C
H
amano
M
e
rge bra
n
c
h
'ma
i
nt'
commit
|
commitdiff
|
tree
2010-05-21
J
u
nio C
H
amano
M
erge
b
r
a
nch 'by/bla
m
e-d
o
c
-
m-c'
commit
|
commitdiff
|
tree
2010-05-21
Junio C Ha
m
ano
Mer
g
e b
r
anch 'by
/
lo
g
-follow'
commit
|
commitdiff
|
tree
2010-05-21
Junio C H
a
mano
Merg
e
bran
c
h
'mg/ad
v
ice-s
t
a
tushints'
commit
|
commitdiff
|
tree
2010-05-21
Ju
n
io C H
a
mano
Merge br
a
nch 'cb
/
maint-stash-orphan
e
d-file
'
commit
|
commitdiff
|
tree
2010-05-21
Ju
n
io
C
H
amano
Merge
b
ranch
'
jn/maint-bundle'
commit
|
commitdiff
|
tree
2010-05-21
Ju
n
io
C
H
am
a
no
Merge branch
'pb/patch-id-p
l
us'
commit
|
commitdiff
|
tree
2010-05-21
Junio C
H
ama
n
o
Merge
branch 'rr/d
o
c-submitt
i
n
g
'
commit
|
commitdiff
|
tree
2010-05-21
Junio C Ha
m
ano
Merge branch 'st/remot
e
-tags
-
no-tags'
commit
|
commitdiff
|
tree
2010-05-21
Junio C H
a
mano
M
e
r
g
e bra
n
ch 'jn/f
s
ck-id
e
n
t
'
commit
|
commitdiff
|
tree
2010-05-21
Juni
o
C Haman
o
M
erge branch
'
jn/gitweb-c
a
ching-prep'
commit
|
commitdiff
|
tree
2010-05-21
Junio C Haman
o
Merg
e
b
r
anch 'jn/gitweb-install'
commit
|
commitdiff
|
tree
2010-05-21
J
u
nio C Hamano
Merge branch 'jn/gitweb-our-sq
u
e
lch'
commit
|
commitdiff
|
tree
2010-05-21
Junio C Hamano
Mer
g
e b
r
anch 'jn/r
e
que
s
t-pull'
commit
|
commitdiff
|
tree
2010-05-21
J
u
nio C Hamano
Merge b
r
a
nch 'jn/s
h
o
r
tlo
g
'
commit
|
commitdiff
|
tree
2010-05-21
Junio C Hamano
Merg
e
branch 'jn
/
t7006-fixup
'
commit
|
commitdiff
|
tree
2010-05-21
Junio
C Hamano
Merge b
r
an
c
h
'js/mai
n
t-
r
ece
i
ve-pack-symref-a
l
ias'
commit
|
commitdiff
|
tree
2010-05-21
Junio C
H
aman
o
Me
r
ge branc
h
'sp/maint-dum
b
-http-p
a
ck-r
e
idx'
commit
|
commitdiff
|
tree
2010-05-21
Junio C H
a
man
o
Mer
g
e branch 'jn/submodule-basic-t
e
s
t'
commit
|
commitdiff
|
tree
2010-05-21
J
u
nio C Hamano
Merg
e
br
a
n
c
h 'np/
i
ndex
-
p
ack-memsave
'
commit
|
commitdiff
|
tree
2010-05-21
Junio C Ha
m
an
o
M
erge branch
'jc/am-3-s
h
o
w-corrupted-pat
c
h'
commit
|
commitdiff
|
tree
2010-05-21
Junio C Hamano
Merge branc
h
'jc/maint-no-
r
eflog-expire-unreach-fo
r
.
.
.
commit
|
commitdiff
|
tree
2010-05-21
Ju
n
io
C
Hama
n
o
M
e
r
ge br
a
nch
'
c
w
/maint-exec-defpath'
commit
|
commitdiff
|
tree
2010-05-21
Junio C Hamano
Merge
branch 'tr/wor
d
-
d
iff
'
commit
|
commitdiff
|
tree
2010-05-21
Junio
C Hamano
Merge branch 'sp
/
maint-describe-tiebreak-
w
ith-tag
g
er
.
.
.
commit
|
commitdiff
|
tree
2010-05-21
Junio C H
a
ma
n
o
Merge branc
h
'jc/stat
u
s-sh
o
w-ignored'
commit
|
commitdiff
|
tree
2010-05-21
Junio C Ham
a
no
Merge branch '
n
p
/malloc-thr
e
ading'
commit
|
commitdiff
|
tree
2010-05-21
Junio C Hamano
Merge
b
ranch
'
sr/remot
e
-
h
elp
e
r-export'
commit
|
commitdiff
|
tree
2010-05-21
J
u
n
io C Hamano
Merge b
r
anch
'ld/
d
iscove
r
y-limit-to-fs'
(
earl
y
part)
commit
|
commitdiff
|
tree
2010-05-21
Junio C
Hamano
Merge b
r
anch '
a
r/conf
i
g
-
from-command-line'
commit
|
commitdiff
|
tree
2010-05-21
J
u
nio
C Ham
a
no
M
er
g
e branch 'em/
c
hecko
u
t-o
r
ph
a
n
'
commit
|
commitdiff
|
tree
2010-05-21
Junio C Ham
a
no
Merge
bra
n
c
h
'
maint'
commit
|
commitdiff
|
tree
2010-05-20
Junio C
H
ama
n
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-05-19
Junio C Hamano
Merge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2010-05-12
Ju
n
io
C
Hama
n
o
Merge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2010-05-11
Ju
n
io C
Hamano
Me
r
ge branch
'
m
a
int'
commit
|
commitdiff
|
tree
2010-05-09
Junio C
H
amano
Start
1
.
7
.
2 cycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-05-09
Jun
i
o C H
a
man
o
Merge branch 'bg/ap
p
ly-bl
a
nk-trailing-context
'
commit
|
commitdiff
|
tree
2010-05-09
Junio C Ha
m
ano
Merge
b
r
a
n
ch 'bg/send-email-smtpdomain'
commit
|
commitdiff
|
tree
2010-05-09
Junio C Ha
m
ano
M
e
r
ge
b
ranc
h
'rc/ls-remote-
d
ef
a
ult'
commit
|
commitdiff
|
tree
2010-05-09
Junio C Hamano
M
erge br
a
nch 'rc/maint
-
cur
l
-helpe
r
'
commit
|
commitdiff
|
tree
2010-05-09
Junio C Haman
o
Merge branch 'hg/
m
a
int-attr-fix'
commit
|
commitdiff
|
tree
2010-05-09
J
unio C Hamano
Merge branch 'eb/
u
npretty-b-format'
commit
|
commitdiff
|
tree
2010-05-09
Jun
i
o
C Hama
n
o
Merge b
r
a
n
ch 'ab/com
m
it-empty-messag
e
'
commit
|
commitdiff
|
tree
2010-05-09
Junio C H
a
m
a
no
Merge branch 'jc/
t
est-sleepless
'
commit
|
commitdiff
|
tree
2010-05-09
Junio C Hamano
M
e
rge bra
n
ch
'
j
c
/
mai
n
t-reflog-expire-unrea
c
hable'
commit
|
commitdiff
|
tree
2010-05-09
Jun
i
o C Hamano
Mer
g
e b
r
anch 'sd/log-decorate'
commit
|
commitdiff
|
tree
2010-05-09
Junio C Hamano
Merge branch 'mh/status-optionally-
r
efresh'
commit
|
commitdiff
|
tree
2010-05-09
Junio C Hamano
Merge
branch 'cw/
w
s-in
d
ent-wi
t
h-tab'
commit
|
commitdiff
|
tree
2010-05-09
Junio C Hama
n
o
Mer
g
e b
r
anch 'cc/rev
e
r
t
-stra
t
egy'
commit
|
commitdiff
|
tree
2010-05-09
Junio C Hamano
Merge branch '
s
c/h
t
tp
-
l
a
te
-
auth'
commit
|
commitdiff
|
tree
2010-05-09
Junio C
H
aman
o
Mer
g
e branch 'jk/cached-tex
t
conv
'
commit
|
commitdiff
|
tree
2010-05-09
Junio C Hamano
Merge branch 'pc
/
remov
e
-
w
arn'
commit
|
commitdiff
|
tree
2010-05-08
Junio C H
a
m
a
no
M
erg
e
branch 'jn/ma
i
nt-request-pull' into jn/r
e
ques
t
.
.
.
commit
|
commitdiff
|
tree
2010-05-08
Juni
o
C
H
a
mano
t5150: protec
t
backslash w
i
t
h
ba
c
kslash in shell
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-05-04
Junio C Hamano
Merge branc
h
'ma
i
nt-1
.
7
.
0' int
o
maint
commit
|
commitdiff
|
tree
2010-05-04
Jun
i
o
C
Hamano
clone: quell the progress rep
o
rt
f
rom init
and repor
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-05-02
J
u
nio C H
a
mano
wt-statu
s
: fix 'fprintf' compilation warning
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-05-02
J
u
n
io C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-04-24
Junio C Hamano
Git 1
.
7
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-24
Ju
n
i
o
C
Hamano
Merge
branch 'maint'
commit
|
commitdiff
|
tree
2010-04-23
J
u
n
i
o C Ham
a
n
o
Sync
w
ith 1
.
7
.
0
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-23
J
u
nio C Hamano
Git 1
.
7
.
0
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-23
J
uni
o
C Ham
a
no
Merge bra
n
ch 'mg/use-default-abbre
v
-le
n
gth-i
n
-rev-li
s
t
.
.
.
commit
|
commitdiff
|
tree
2010-04-23
J
unio C H
a
mano
M
erge branc
h
'wp/
d
oc-filter-direction'
into
ma
i
nt
commit
|
commitdiff
|
tree
2010-04-23
Junio C Haman
o
Merge b
r
anch 'jk
/
maint-diffstat-ov
e
rflow' into maint
commit
|
commitdiff
|
tree
2010-04-23
Junio C
H
amano
Merg
e
branch 'da/maint-python-startup' int
o
maint
commit
|
commitdiff
|
tree
2010-04-22
Junio C H
a
mano
Merge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2010-04-20
Junio C Hama
n
o
Merge
b
ranc
h
'maint'
commit
|
commitdiff
|
tree
2010-04-19
J
u
nio C H
a
mano
Merge bra
n
c
h
'main
t
-1
.
6
.
6' int
o
maint
commit
|
commitdiff
|
tree
2010-04-19
Ju
n
io C Hamano
Git 1
.
7
.
1-rc
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-19
Junio C Hamano
Me
r
ge bran
c
h 'rr/remote-helper-
d
oc'
commit
|
commitdiff
|
tree
2010-04-19
Junio C Hamano
Merge br
a
nch
'
wp/
d
o
c
-filter-dire
c
tion'
commit
|
commitdiff
|
tree
2010-04-19
Juni
o
C Hamano
Merg
e
bra
n
c
h
'jk/main
t
-diffstat-o
v
e
r
fl
o
w'
commit
|
commitdiff
|
tree
2010-04-19
Junio C Hama
n
o
Merge
branc
h
'jg
/
auto-init
i
a
l
i
z
e
-no
t
e
s
-with-percent
.
.
.
commit
|
commitdiff
|
tree
2010-04-19
Junio C Hama
n
o
Merge bra
n
c
h
'
m
aint
'
commit
|
commitdiff
|
tree
2010-04-19
Ju
n
io C
H
ama
n
o
Merge git:/
/
git
.
kerne
l
.
org/pu
b
/
scm/gitk/gitk
commit
|
commitdiff
|
tree
2010-04-18
Junio C
Ha
m
ano
t
3
301: ad
d
test
s
to use --format="%N"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-18
Junio C Hamano
reflog --
e
xpire-unreachable:
sp
e
cial case entrie
s
i
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-18
Jun
i
o C Hamano
mo
r
e
w
ar
o
n "sleep" in tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-17
Junio C Hamano
Merge
b
r
anch 'maint'
commit
|
commitdiff
|
tree
2010-04-17
Ju
n
i
o
C
H
a
mano
gitweb:
simplify gitweb
.
min
.
*
g
en
e
ratio
n
and clean
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-14
Junio C Ha
m
a
n
o
Docu
m
en
t
gc
.
<pattern>
.
r
eflo
g
e
x
pire variables
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-14
Juni
o
C
H
ama
n
o
am -3: recover
t
he diagnostic message
s
fo
r
corrupt
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-14
Junio C Hama
n
o
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2010-04-11
Junio C Haman
o
Merge bra
n
ch 'jl/maint-su
b
module-gi
t
fi
l
e
-a
w
a
rene
s
s'
commit
|
commitdiff
|
tree
2010-04-11
Juni
o
C Hamano
Syn
c
with 1
.
7
.
0
.
5
commit
|
commitdiff
|
tree
2010-04-11
Junio
C
Haman
o
Merge branch 'jc/doc
-
submit-gmail
'
commit
|
commitdiff
|
tree
2010-04-11
Junio
C H
a
mano
G
it 1
.
7
.
0
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-11
J
unio C Hamano
Me
r
ge branch
'
rc/maint-reflog-
m
sg-for
-
fo
r
ce
d
-bra
n
c
h
.
.
.
commit
|
commitdiff
|
tree
2010-04-11
Junio C Haman
o
blame docume
n
tation: -M/-C notice c
o
p
i
ed lines as well
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-10
Junio C H
a
ma
n
o
Git
1
.
7
.
1-
r
c1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next