repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Make 'traverse_trees()' traverse conflicting DF entries in parallel
2008-03-09
Linus Torv
a
lds
Make 'traverse_trees()' traverse conflicting
DF
e
n
tries
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
L
inus T
o
rvalds
Add return value to
'
t
r
averse
_
tree()' call
b
ack
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
Li
n
us Tor
v
alds
M
a
ke '
t
ravers
e
_tree()
'
use
l
i
n
ked struc
t
ure
r
athe
r
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
Linus Torvalds
Add 'df_name_compare()' hel
p
er fun
c
ti
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
Je
f
f King
A
dd a test for re
a
d-tre
e
-u --reset with a D/F conflict
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
J
unio C Hamano
Merge branch 'p
h
/parseopt'
commit
|
commitdiff
|
tree
2008-03-09
Juni
o
C Ham
a
no
Merg
e
branch 'dp/clea
n
-fix'
commit
|
commitdiff
|
tree
2008-03-09
Junio C
H
a
mano
Me
r
g
e branch 'ml/submodule
-
add-exi
s
ting'
commit
|
commitdiff
|
tree
2008-03-09
Junio C Haman
o
Merge branch 'mr/co
m
pat-sn
p
r
i
ntf'
commit
|
commitdiff
|
tree
2008-03-09
Junio C Hama
n
o
Merge
branch 'sp/fetch-
o
ptim'
commit
|
commitdiff
|
tree
2008-03-09
Junio C Ham
a
no
Mer
g
e
b
ranch 'jc/describe-
a
lw
a
y
s
'
commit
|
commitdiff
|
tree
2008-03-09
Junio C
H
am
a
no
Merge branch 'jc/
a
m'
commit
|
commitdiff
|
tree
2008-03-09
Junio C Hamano
Merg
e
branch
'cr/reset-pa
r
seopt'
commit
|
commitdiff
|
tree
2008-03-09
Jun
i
o
C Hamano
Merge branch 'jn/git
w
eb
-
pi
c
k
a
xe'
commit
|
commitdiff
|
tree
2008-03-09
J
u
nio C Ha
m
ano
Merge branc
h
'
kb/
m
aint-filt
e
r-bran
c
h-d
i
s
appe
a
r'
commit
|
commitdiff
|
tree
2008-03-09
J
unio C Hamano
Mer
g
e branch 'maint
'
to sync with
1
.
5
.
4
.
4
commit
|
commitdiff
|
tree
2008-03-09
Junio C Hamano
G
IT 1
.
5
.
4
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
Santi Béjar
ident
.
c: rewo
r
d
error mess
a
g
e
when th
e
user name cann
o
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
John Goe
r
zen
Fix dcommit, rebase
w
h
en
re
w
rit
e
Root is in
u
se
commit
|
commitdiff
|
tree
2008-03-08
J
unio C Haman
o
filter-br
a
nc
h
:
handle "di
s
appear
i
ng
t
ree" case correctly
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-08
Charles Bailey
merge
-
t
oo
l
docume
n
tation: desc
r
ibe
c
ust
o
m command usage
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-08
Charl
e
s Bai
l
e
y
git-mergetool
do
c
umenta
i
ton: s
h
ow toolnames in typewri
t
er
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-08
Adeodato Simó
Really m
a
k
e the LF after
r
eset in f
a
st-import opti
o
nal
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-08
Junio C H
a
mano
Merg
e
branch 'a
w
/maint-sho
r
tlog-blan
k
-
li
n
es'
commit
|
commitdiff
|
tree
2008-03-08
J
unio C H
a
m
a
no
Me
r
g
e
branch '
m
h/main
t
-http-proxy-fi
x
' into ma
i
nt
commit
|
commitdiff
|
tree
2008-03-08
Junio C Hamano
Merge
b
ra
n
ch 'js/maint-daemo
n
' into mai
n
t
commit
|
commitdiff
|
tree
2008-03-08
Junio C
H
aman
o
Merge
b
ranch 'js/maint-cvsex
p
ort'
into
ma
i
n
t
commit
|
commitdiff
|
tree
2008-03-08
Ju
n
io
C
Hamano
Merge branch 'jc/m
a
int
-
log-merge-left-r
i
ght
'
into maint
commit
|
commitdiff
|
tree
2008-03-08
Juni
o
C Ham
a
no
M
e
rge b
r
anch 'ew/maint-s
v
n-cert-fi
l
eprovider' into
.
.
.
commit
|
commitdiff
|
tree
2008-03-08
Ju
n
i
o C Hamano
Merge branch
'
ma
i
nt'
commit
|
commitdiff
|
tree
2008-03-08
Junio C Hamano
send-em
a
il: --no-signed-off-cc should suppress 'sob' cc
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-08
J
u
nio C
H
a
mano
M
erge branch 'js
/
reflog-delete'
commit
|
commitdiff
|
tree
2008-03-08
Ju
n
io C Hamano
Me
r
ge branch 'dc
/
format-
p
retty'
commit
|
commitdiff
|
tree
2008-03-08
Junio C Hamano
M
erge branch 'cb
/
mergetool'
commit
|
commitdiff
|
tree
2008-03-08
Junio C
H
amano
git-c
l
ean: ad
d
t
e
sts for re
l
ative path
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-08
Dmitry P
o
ta
p
ov
git-cl
e
an: cor
r
ect p
r
int
i
n
g re
l
ative pa
t
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-08
Dmitry Potap
o
v
Make private quote_pa
t
h() in wt-
s
t
a
tus
.
c ava
i
lable
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-07
Pie
r
r
e Habouzit
unquote_c_styl
e
: fix off-by-one
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-07
Junio C Hamano
test-l
i
b:
fi
x
TERM to dumb
f
or test r
e
peatabil
i
ty
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-07
Uwe Klei
n
e-König
confi
g
.
txt
:
re
f
er to --
u
pl
o
ad-pack and --
r
e
ceive-pack
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-07
Junio C H
a
ma
n
o
M
erge branch
'
a
r/sgid-bsd'
commit
|
commitdiff
|
tree
2008-03-07
Junio C Ham
a
no
Merge branch '
c
c/
r
un-command'
commit
|
commitdiff
|
tree
2008-03-07
J
unio
C
Hamano
R
e
ver
t
part of
d0
8
9eba (setup:
s
a
n
i
t
i
z
e abso
l
ute a
n
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-07
Junio C Hamano
Revert
p
a
rt of 1abf0
9
5 (git-add: adjust
to the get_pathspec
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-07
Juni
o
C Ha
m
an
o
Reve
r
t part
o
f 74
4
dacd
(
builtin-mv: mi
n
imum f
i
x to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-07
Jun
i
o C Hamano
get_p
a
ths
p
ec():
die when
a
n out
-
of-
t
re
e
path is
given
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-06
Ju
n
io C Hamano
M
e
rge branch 'maint' of git://rep
o
.
or
.
cz/
g
i
t
-gu
i
into
.
.
.
commit
|
commitdiff
|
tree
2008-03-05
J
a
kub Na
r
ebsk
i
gitwe
b
: Fix
and simplify pickaxe sear
c
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Mark Levedahl
git
-
submodule
- Allow addi
n
g
a
submodule in-place
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Andy
W
hitcro
f
t
shortlog
:
t
a
k
e
t
he first popu
l
ated line of the descripti
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Michal
R
o
k
os
Add com
p
at/snprint
f
.
c for
s
ystems that retur
n
bogus
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Ale
x
Ries
e
n
Do not use GUID on dir
i
n git
init -
-
shared=all on
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
C
h
ristia
n
Cou
d
er
run-
c
omman
d
:
Redirect s
t
derr to a
p
ipe before redirectin
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Carlos Rica
Make
builtin-reset
.
c use parse_options
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
SZ
E
DER Gáb
o
r
b
a
sh
:
git-
b
ran
c
h -d an
d
-m lists only local
b
ranches
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
SZEDER Gáb
o
r
bash: a
d
d g
i
t-branch optio
n
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bai
l
ey
Add a very ba
s
i
c test script f
o
r git merg
e
tool
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
Teach git merge
t
ool to u
s
e custom comma
n
ds define
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Charle
s
Bailey
C
han
g
ed an internal variable of mergetool to support
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
C
h
a
r
les Bailey
Tidy up
g
it mergetool's ba
c
kup f
i
le b
e
haviour
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
De
n
is Cheng
log/show/wha
t
changed
:
introduce
f
ormat
.
pretty configurati
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
D
enis Ch
e
ng
specify e
x
p
l
icit "--pretty=m
e
dium" wit
h
`g
i
t l
o
g
/show
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
De
n
is Cheng
whatchanged
d
o
c
u
me
n
tation: share descripti
o
n
of --pretty
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Junio
C Ham
a
no
am:
-
-re
b
as
i
n
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Junio
C
H
amano
a
m
: remove su
p
po
r
t f
o
r
-d
.
dotest
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Junio C H
a
mano
a
m: rea
d
from the ri
g
ht mailbox wh
e
n star
t
ed fro
m
a
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Junio C H
a
m
a
no
fsc
k
.
c: fix bogus "empty tree" ch
e
ck
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Shawn O
.
Pearce
Teac
h
git
-
fetch to explo
i
t server s
i
de automatic tag
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Shaw
n
O
.
Pear
c
e
Tea
c
h fetc
h
-
p
ack/up
l
oad-pack abo
u
t --
i
n
clude-tag
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Sh
a
wn O
.
Pearce
git-
p
ack-objects
:
A
utomatica
l
l
y
pa
c
k annotated tags
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-04
Junio C
H
amano
R
e
ve
r
t "unpac
k
-object
s
: prevent writ
i
ng of inconsistent
.
.
.
commit
|
commitdiff
|
tree
2008-03-04
Junio C Hamano
Revert
"
receiv
e
-pa
c
k: use
s
t
rict mode
for unp
a
cking
.
.
.
commit
|
commitdiff
|
tree
2008-03-04
Junio C H
a
mano
Merge b
r
anch '
m
a
i
nt
'
commit
|
commitdiff
|
tree
2008-03-04
S
h
awn O
.
P
e
a
r
c
e
Fix 'gi
t
remote show
'
regression
o
n empty repository
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-04
Mike
H
omme
y
t3407-rebase-
a
bort
.
s
h: Enhance exis
t
ing te
s
t
s
, and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-04
Simon Hausman
n
git-p4: Fix
i
mport of changesets
with file del
e
tions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-04
A
l
e
x Riese
n
F
i
x t
e
st
f
or cleanu
p
failure
i
n t7300 on Windows
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-04
Jun
i
o C Hamano
t6120
(d
e
scr
i
be
)
: check
-
-
l
o
n
g properly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-04
Shawn O
.
Pearce
Add g
i
t-describe test for "
v
erify annotated tag names
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-04
Shawn O
.
Pearce
Test for packed tags in git-describe
out
p
ut
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-04
S
ha
w
n O
.
Pearce
Don't allow
git
-
describe
f
ail
u
re
s
to go unnotic
e
d in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
Ju
n
io
C Hama
n
o
describe: r
e
-
fix d
i
splay_
n
ame()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
Matthieu
M
o
y
Fix in
c
orrect w
o
r
d
ing
i
n git-merge
.
txt
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
Gerrit
P
ap
e
git-merge
.
sh: bett
e
r handling of co
m
bine
d
--squash
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
Mi
k
e
H
om
m
ey
Fix random cra
s
hes in http_c
l
eanup()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
Junio C Hamano
describe: fix --long output
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
Juni
o
C Ham
a
no
git-descri
b
e
:
u
se ta
g
s fou
n
d in packed-refs
correctly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
Brandon Case
y
t3903-stash
.
sh: Add tests for new stash commands drop
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
Br
a
nd
o
n Casey
g
it-re
f
lo
g
.
txt: Doc
u
me
n
t
n
ew commands --upd
a
teref and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
Brandon Case
y
t3
9
03-s
t
a
sh
.
sh: A
d
d
missing '&&' to body of te
s
tcase
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
J
unio C Hamano
Merge
commit
'74359821' into
j
s/re
f
l
og-delete
commit
|
commitdiff
|
tree
2008-03-03
Ma
r
t
in Koegler
fetc
h
-pack: check parse_c
o
mmi
t
/obj
e
ct results
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
Juni
o
C
H
amano
d
e
s
cribe --alw
a
ys: fal
l
back to showi
n
g an a
b
breviated
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
Shawn O
.
Pearce
Teach git-fetc
h
to gra
b
a tag at the same
time as a
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
Shawn O
.
Pe
a
rce
Mak
e
git-fetch
follow tags we already have objects
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
Shawn O
.
Pea
r
c
e
Teac
h
upload-pac
k
to log the received
need l
i
nes to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
Shawn O
.
Pe
a
rce
Free the path_list
s
used to f
i
nd non-l
o
c
al tags i
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
S
h
a
wn O
.
P
e
arce
Allow builtin-fetch's find_non_loc
a
l
_tags to append
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
Shawn
O
.
Pearce
E
n
sure ta
i
l pointe
r
ge
t
s set
u
p correctly when w
e
fetch
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
Shawn O
.
Pearce
Remove u
n
necessary delaying
o
f fr
e
e_
r
e
f
s
(ref_map)
in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next