repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
traverse_trees_recursive(): propagate merge errors up
2008-03-10
Ju
n
io C Hamano
trave
r
se_trees_recursive():
p
ropa
g
ate merge
e
rrors up
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-09
Juni
o
C H
a
ma
n
o
Mer
g
e branch 'ph/parseopt'
commit
|
commitdiff
|
tree
2008-03-09
J
u
nio C Hamano
Merge branch 'dp/
c
le
a
n-fix'
commit
|
commitdiff
|
tree
2008-03-09
Juni
o
C Haman
o
M
e
rge branc
h
'
ml/submodu
l
e-add-e
x
i
s
ti
n
g
'
commit
|
commitdiff
|
tree
2008-03-09
Ju
n
io C Hamano
M
erge bra
n
ch 'mr/compa
t
-snprint
f
'
commit
|
commitdiff
|
tree
2008-03-09
Junio C Hamano
Merge branch 'sp/fet
c
h-optim'
commit
|
commitdiff
|
tree
2008-03-09
J
unio C
Hamano
M
e
rge bra
n
c
h
'jc/describe-
a
lw
a
y
s'
commit
|
commitdiff
|
tree
2008-03-09
Ju
n
i
o
C Ha
m
a
no
M
e
rge
branch 'jc/am'
commit
|
commitdiff
|
tree
2008-03-09
J
u
nio
C
Hamano
Merg
e
br
a
nch 'cr/r
e
set-parseopt'
commit
|
commitdiff
|
tree
2008-03-09
Jun
i
o C
H
a
mano
M
e
r
ge bran
c
h 'jn/gitweb-pickaxe'
commit
|
commitdiff
|
tree
2008-03-09
Junio
C
Hamano
Merge branch
'
kb
/
maint
-
filter-branch-disappear
'
commit
|
commitdiff
|
tree
2008-03-09
Juni
o
C Hamano
Merge branch 'maint' t
o
s
y
nc with 1
.
5
.
4
.
4
commit
|
commitdiff
|
tree
2008-03-09
Ju
n
i
o C Hamano
GIT
1
.
5
.
4
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-08
Juni
o
C Hamano
f
ilter-branch: handle "disappear
i
ng tre
e
" case correctly
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-08
Ju
n
io
C Haman
o
M
e
r
ge branch 'aw/maint-shortlog-blank-
l
ines'
commit
|
commitdiff
|
tree
2008-03-08
Junio C Hamano
Merg
e
branch
'mh/maint-http-p
r
oxy-
f
ix' into
m
aint
commit
|
commitdiff
|
tree
2008-03-08
Junio C Ham
a
no
Merge bra
n
ch 'j
s
/maint
-
daemo
n
' into maint
commit
|
commitdiff
|
tree
2008-03-08
J
u
nio C Hamano
Merge br
a
nch
'
js/maint-cvsexport
'
into
m
aint
commit
|
commitdiff
|
tree
2008-03-08
Junio
C
Hamano
M
e
rge branch 'jc/m
a
int-log-merge-left-rig
h
t'
into maint
commit
|
commitdiff
|
tree
2008-03-08
Junio C Hamano
Merge branch 'ew/maint-svn-c
e
rt-fileprov
i
der
'
into
.
.
.
commit
|
commitdiff
|
tree
2008-03-08
Junio
C
H
amano
Merge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2008-03-08
Jun
i
o C Hamano
send
-
e
m
ai
l
:
-
-no-signed-off-cc sh
o
uld suppress 'sob' c
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-08
Junio C Hamano
Merge b
r
anch 'js/reflog-delete'
commit
|
commitdiff
|
tree
2008-03-08
Junio C Hama
n
o
Merge branch 'dc/format-p
r
e
t
ty'
commit
|
commitdiff
|
tree
2008-03-08
Junio C
Ha
m
ano
M
e
rge branch '
c
b/merg
e
to
o
l'
commit
|
commitdiff
|
tree
2008-03-08
Junio C Hamano
git-clean: add tests for
rela
t
ive
p
a
th
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-07
Junio C
Hamano
t
est-lib:
f
i
x
T
ERM
t
o
du
m
b
for
t
e
s
t re
p
eatability
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-07
Junio C Hama
n
o
Merge
b
ranch
'
a
r
/
s
g
id-
b
sd'
commit
|
commitdiff
|
tree
2008-03-07
Junio
C Hamano
M
e
rge bra
n
c
h 'cc/run-com
m
and'
commit
|
commitdiff
|
tree
2008-03-07
Junio C H
a
m
ano
R
e
v
er
t
part of d089eba (
s
etup: sanitize a
b
solute and
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-07
Juni
o
C Hamano
Revert part of
1abf095 (gi
t
-add: adjust to the get_pathspec
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-07
Junio C Ha
m
ano
Revert part of
7
4
4
d
acd (builtin-m
v
:
mini
m
um fix to
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-07
J
u
n
i
o C Hamano
g
e
t_pathspec()
:
die
w
hen an
out-of-t
r
ee pat
h
is
given
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-06
Junio C Hamano
Mer
g
e branch 'main
t
' of git://re
p
o
.
or
.
cz/g
i
t
-gui int
o
.
.
.
commit
|
commitdiff
|
tree
2008-03-05
Junio C Ham
a
no
am: --rebasing
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-05
Jun
i
o C
H
amano
am: rem
o
ve supp
o
r
t for
-
d
.
d
o
t
e
st
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-05
Juni
o
C H
a
mano
am: read
f
r
om the r
i
ght mai
l
box when started from a
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-05
J
u
n
io C H
a
man
o
fsck
.
c: fix b
o
gus "empty tree
"
ch
e
ck
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-04
Junio
C Hamano
R
e
v
ert "unpa
c
k-objects: p
r
event wri
t
ing of in
c
onsistent
.
.
.
commit
|
commitdiff
|
tree
2008-03-04
Junio
C
Hamano
Re
v
ert "rece
i
ve-pack: use strict
mode for unpacking
.
.
.
commit
|
commitdiff
|
tree
2008-03-04
J
u
nio C
H
am
a
no
Mer
g
e
branc
h
'main
t
'
commit
|
commitdiff
|
tree
2008-03-04
Junio C Hamano
t6120 (de
s
cribe)
:
check
-
-
long properly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-03
Junio C Hamano
d
escribe: re-fix display_na
m
e
()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-03
J
u
nio C Hamano
describe: fix --long out
p
ut
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-03
Juni
o
C Hamano
git-des
c
ribe:
use tags fou
n
d
i
n pac
k
e
d
-ref
s
correct
l
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-03
Junio C Hamano
Me
r
ge
commit '74359821' into
j
s/ref
l
og-delet
e
commit
|
commitdiff
|
tree
2008-03-03
Junio C Ham
a
no
de
s
cribe --always:
f
a
ll back to showing an
a
b
bre
v
iated
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-03
Jun
i
o C Haman
o
Update
draft
release not
e
s fo
r
1
.
5
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-03
Junio C Hamano
M
e
rge bra
n
ch 'ma
i
nt'
commit
|
commitdiff
|
tree
2008-03-03
J
unio
C Hamano
Update draft
r
elease notes for 1
.
5
.
4
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-03
Jun
i
o C Ham
a
no
test
s
: introduce test_must_fail
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-03
Ju
n
io C Hamano
M
e
rge branch
'
np
/
ve
r
i
fy
-
pack'
commit
|
commitdiff
|
tree
2008-03-02
Junio C
H
aman
o
Me
r
ge bra
n
ch 'sp
/
des
c
ribe-tag
'
commit
|
commitdiff
|
tree
2008-03-02
Junio C
Hama
n
o
M
e
r
ge bran
c
h 'pb/cvs
i
m
p
ort'
commit
|
commitdiff
|
tree
2008-03-02
Junio
C
Hamano
M
e
r
ge branch 'jc/maint-log-merge-left
-
right'
commit
|
commitdiff
|
tree
2008-03-02
Junio C Hamano
Merge branc
h
'
mh/maint-http-p
r
oxy-
f
ix'
commit
|
commitdiff
|
tree
2008-03-02
Junio C
H
amano
Mer
g
e branch 'cb/http-test'
commit
|
commitdiff
|
tree
2008-03-02
Junio
C
Hamano
M
er
g
e b
r
an
c
h
'
jc/remote-m
u
lt
i
-url'
commit
|
commitdiff
|
tree
2008-03-02
Junio C Hamano
Mer
g
e b
r
anch '
j
n/git
w
eb-grep'
commit
|
commitdiff
|
tree
2008-03-02
J
u
ni
o
C Hamano
Merge b
r
a
n
ch '
m
k
/
main
t
-parse-careful
'
commit
|
commitdiff
|
tree
2008-03-02
Juni
o
C Hamano
Merge branch 'sb/descr
i
be-long'
commit
|
commitdiff
|
tree
2008-03-02
Junio C Hamano
Mer
g
e branch 'ew/m
a
int-svn-cert-f
i
leprovid
e
r'
commit
|
commitdiff
|
tree
2008-03-02
Junio C Hamano
M
erge branch 'js/maint-daemon'
commit
|
commitdiff
|
tree
2008-03-02
Ju
n
io
C
Hamano
diff: make su
r
e w
o
rk
t
ree side is shown as 0{40} when
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-02
Jun
i
o C Hamano
diff-lib
.
c:
c
o
ns
t
n
e
ss
strengthening
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-02
Junio C Ha
m
ano
Clean u
p
find_unique_
a
bbrev() callers
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-02
Junio C Hamano
find_
u
nique_abbrev(): redef
i
ne semantics
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-02
Junio C Hamano
CodingG
u
idelines: spell out how we use grep in our
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-01
Juni
o
C
Hamano
t6024: move "git reset" to prep
a
re for a te
s
t inside
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-01
Junio C H
a
mano
Me
r
ge branch 'm
a
ster' of git://repo
.
or
.
c
z
/git-g
u
i
commit
|
commitdiff
|
tree
2008-03-01
Jun
i
o C
H
amano
Me
r
ge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2008-03-01
Ju
n
io C Hamano
Mer
g
e branch 'm
a
int' of g
i
t://r
e
po
.
or
.
cz/git-g
u
i
into
.
.
.
commit
|
commitdiff
|
tree
2008-02-29
Juni
o
C Ha
m
ano
Upda
t
e draft release no
t
e
s for 1
.
5
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-02-29
Junio
C
H
a
mano
tests: in
t
roduce
t
e
s
t_must_fail
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-02-29
Juni
o
C Ham
a
no
Merge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2008-02-28
Junio C Hamano
Sta
r
t prepa
r
ing f
o
r
1
.
5
.
4
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-02-28
Junio
C
H
a
mano
format-patch: remov
e
a le
f
tov
e
r debu
g
ging message
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-02-27
Junio C Hamano
Fix "git log --
m
erge --left-
r
ight"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-02-27
Jun
i
o C Haman
o
Merg
e
branch 'maint'
commit
|
commitdiff
|
tree
2008-02-27
Ju
n
i
o C Hamano
git-
r
emote: do
n
o
t compl
a
in on
multiple U
R
Ls for a
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-02-27
Ju
n
i
o
C H
a
mano
Merge branch
'git
-
p4' of g
i
t://repo
.
or
.
c
z
/
g
i
t
/gi
t
-p4
commit
|
commitdiff
|
tree
2008-02-27
J
uni
o
C Hamano
Merge branch 'jm/free'
commit
|
commitdiff
|
tree
2008-02-27
Junio C Hamano
Merge branch 'js/b
r
anch
-
track
'
commit
|
commitdiff
|
tree
2008-02-27
Junio C Ham
a
no
M
e
rge b
r
anc
h
'db/
c
h
e
ckout'
commit
|
commitdiff
|
tree
2008-02-27
Junio C Hamano
Merge branch 'db/
c
over-lett
e
r'
commit
|
commitdiff
|
tree
2008-02-27
Junio C Hama
n
o
Merg
e
branch 'js/merge'
commit
|
commitdiff
|
tree
2008-02-27
Juni
o
C
Ha
m
an
o
M
e
r
ge branch 'c
w
/
b
ise
c
t'
commit
|
commitdiff
|
tree
2008-02-27
Junio C Hamano
Merg
e
branch 'jk/help-a
l
ia
s
'
commit
|
commitdiff
|
tree
2008-02-27
Junio
C
H
amano
Merge branch 'j
s
/run-com
m
and'
commit
|
commitdiff
|
tree
2008-02-27
J
u
n
io C Hamano
Me
r
g
e branch 'j
c
/di
f
f-relativ
e
'
commit
|
commitdiff
|
tree
2008-02-27
Jun
i
o C Hamano
Merge branch 'gp/hash-st
d
in'
commit
|
commitdiff
|
tree
2008-02-27
Junio
C
Hama
n
o
Merge br
a
nch 'db/push-single-with-HEAD'
commit
|
commitdiff
|
tree
2008-02-27
Jun
i
o C
H
a
mano
Merg
e
branch
'
db
/
h
o
st
-
a
l
ia
s
'
commit
|
commitdiff
|
tree
2008-02-27
Junio C Hamano
M
e
rge branch 'ae/pack-
a
u
tothread'
commit
|
commitdiff
|
tree
2008-02-27
Junio C
H
a
m
ano
Merge branch
'bc/reflog
-
f
ix'
commit
|
commitdiff
|
tree
2008-02-27
Junio C Hamano
Merge branch 'sp/de
s
cribe'
commit
|
commitdiff
|
tree
2008-02-27
Junio C Hamano
M
e
rge
b
ranch 'js/maint-http-pus
h
' i
n
to mai
n
t
commit
|
commitdiff
|
tree
2008-02-27
Ju
n
io C Hamano
Reve
r
t
"pac
k
-o
b
j
e
c
t
s
: Pri
n
t a m
e
ssage describing
t
he
.
.
.
commit
|
commitdiff
|
tree
2008-02-26
Junio C
Hamano
gi
t
-a
p
p
ly --w
h
itespac
e
=fix: fix
off
by one
t
h
inko
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-02-26
Junio
C
Ham
a
no
M
e
r
g
e
b
ranch
'maint'
commit
|
commitdiff
|
tree
next