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
traverse_trees_recursive(): propagate merge errors up
2008-03-10
Junio C Haman
o
traver
s
e_trees_rec
u
rs
i
ve(): propagate merg
e
e
r
ror
s
up
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
Linus To
r
valds
unpack_t
r
ees(): minor mem
o
ry leak fix
i
n unu
s
ed
d
e
stination
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
L
inus
Torv
a
ld
s
Make
'unpack_tree
s
()' h
a
v
e
a separate so
u
rce and destina
t
ion
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
L
i
nus Torvalds
Ma
k
e
'unpack_
t
ree
s
()' take the index to work on as
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
Linus Torvalds
Add
'const'
whe
r
e appropri
a
te to index
handling f
u
nctions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
Linus
Torv
a
ld
s
F
i
x
tree-walking compare_entry()
i
n the presense of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
Linus Torvalds
Move 'unpack_t
r
ees
(
)' ov
e
r to
'
traverse_tree
s
(
)
'
i
n
t
e
rface
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
Linus Torvalds
M
ake 'trave
r
se_
t
rees()' t
r
averse conflic
t
ing DF entries
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
Linus Torvalds
Add
r
etur
n
value to 'traverse_tree()
'
callback
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
Linus Torvalds
Make 'traverse_tree()'
use
linked structure rather
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
L
i
nus T
o
rval
d
s
Ad
d
'df_n
a
me_compare()' hel
p
er f
u
nction
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
J
eff King
A
d
d a
t
est for read-tr
e
e -u --reset
w
ith a D/F
c
onflict
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
Jun
i
o C Hamano
Merge
b
r
anch 'ph/parseopt
'
commit
|
commitdiff
|
tree
2008-03-09
J
unio C
H
a
mano
M
e
rge b
r
anch 'dp/clean-fix'
commit
|
commitdiff
|
tree
2008-03-09
J
u
nio C
H
amano
Merge branch '
m
l/subm
o
dule-add-exis
t
ing
'
commit
|
commitdiff
|
tree
2008-03-09
J
unio C Hamano
Merge
bran
c
h 'm
r
/compat-snprintf'
commit
|
commitdiff
|
tree
2008-03-09
Junio C
H
ama
n
o
M
e
r
ge b
r
anch
'sp/fetch-optim
'
commit
|
commitdiff
|
tree
2008-03-09
Junio C Hamano
Merge
b
ran
c
h
'
jc/
d
e
s
cribe-always'
commit
|
commitdiff
|
tree
2008-03-09
Jun
i
o C
Hama
n
o
M
e
r
g
e br
a
nch '
j
c
/
am'
commit
|
commitdiff
|
tree
2008-03-09
Junio C Hamano
Merge branc
h
'
c
r/reset-
p
a
rse
o
pt'
commit
|
commitdiff
|
tree
2008-03-09
Junio C Hamano
Merge branch 'jn/gitwe
b
-pic
k
axe'
commit
|
commitdiff
|
tree
2008-03-09
J
unio C Hamano
Me
r
ge branch
'kb/maint-f
i
lter
-
branch-disappear'
commit
|
commitdiff
|
tree
2008-03-09
Junio C Ham
a
no
Merge b
r
an
c
h
'
m
a
int' to
syn
c
with 1
.
5
.
4
.
4
commit
|
commitdiff
|
tree
2008-03-09
Junio
C
Hama
n
o
GIT 1
.
5
.
4
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
Santi Béjar
ident
.
c:
reword
error message when the
u
ser name can
n
ot
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
J
o
h
n Go
e
rzen
Fix dcomm
i
t, rebase
w
h
e
n rewriteRoot is i
n
us
e
commit
|
commitdiff
|
tree
2008-03-08
Juni
o
C
H
amano
filter-
b
ra
n
ch
:
handle "disappearing tree"
c
a
se c
o
rrectly
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-08
Charles Bailey
merge-tool
d
ocu
m
e
n
tation: describe cu
s
t
o
m
c
o
mmand usage
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-08
Charles
Bail
e
y
git-mergeto
o
l d
o
c
umen
t
aiton
:
show toolnames
in
t
ypewriter
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-08
A
d
eoda
t
o Simó
Really make the LF af
t
er rese
t
in fast-import
opt
i
onal
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-08
Ju
n
io C Hamano
Merge bra
n
ch 'aw/maint-shortl
o
g-blank-lines'
commit
|
commitdiff
|
tree
2008-03-08
J
u
ni
o
C Ha
m
ano
Me
r
ge b
r
anc
h
'mh/
m
a
int-http-proxy-
f
ix' in
t
o maint
commit
|
commitdiff
|
tree
2008-03-08
Junio C Haman
o
Merg
e
branch 'js/mai
n
t-da
e
mon' into maint
commit
|
commitdiff
|
tree
2008-03-08
Junio
C
Hamano
M
erg
e
b
r
anch
'
js/
m
aint-cvse
x
port' into m
a
int
commit
|
commitdiff
|
tree
2008-03-08
Junio C Hamano
Merge branch 'jc/
m
aint-log-merge-left-right' into maint
commit
|
commitdiff
|
tree
2008-03-08
Junio
C
Hamano
Merge br
a
nch 'ew
/
maint-svn
-
cert-fi
l
epro
v
ider' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2008-03-08
Junio C Hamano
Mer
g
e branch 'm
a
int'
commit
|
commitdiff
|
tree
2008-03-08
Junio C Hamano
send-
e
mail: --
n
o-signed-o
f
f
-cc s
h
ould
suppress
'
sob' c
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-08
Junio
C
Hamano
M
e
r
ge br
a
nch 'j
s
/reflog-delete'
commit
|
commitdiff
|
tree
2008-03-08
Junio C
H
amano
M
e
r
g
e
bra
n
ch 'dc/
f
o
r
m
at-pretty'
commit
|
commitdiff
|
tree
2008-03-08
Junio
C
Haman
o
M
e
rge branch 'cb/mergetool'
commit
|
commitdiff
|
tree
2008-03-08
Junio C
H
amano
git-
c
l
ean: add tests for rela
t
ive path
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-08
Dmitry
P
ot
a
pov
gi
t
-c
l
e
an: cor
r
ec
t
pr
i
nting
r
elative path
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-08
Dmit
r
y Potapo
v
Mak
e
private quote_path() in wt-
s
ta
t
us
.
c av
a
ilable
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-07
Pierre
Habouzit
unquote
_
c_style: fix off-by-one
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-07
Junio C Hamano
test-lib: fi
x
TERM to
dumb for tes
t
repeata
b
ility
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-07
Uwe Kleine-König
c
o
n
fig
.
tx
t
: refer to --uplo
a
d
-pack and --re
c
ei
v
e
-
pack
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-07
J
u
n
i
o
C
Hamano
M
e
rg
e
bran
c
h 'a
r
/
sgid-bsd'
commit
|
commitdiff
|
tree
2008-03-07
Junio C Hamano
Merge branch 'cc/
r
u
n
-command'
commit
|
commitdiff
|
tree
2008-03-07
Junio C Hamano
Re
v
ert p
a
rt o
f
d089eba (setup:
s
a
nitize absolute and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-07
Junio C Hamano
Rev
e
rt part
o
f
1abf095
(
git-add: adj
u
st to
th
e
get_p
a
thspec
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-07
J
u
nio
C
Ham
a
n
o
Rev
e
rt part of
7
44dacd (builtin
-
m
v
: minimum fix to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-07
Junio C Hama
n
o
get
_
path
s
pec(): die when an o
u
t-of-tr
e
e path
i
s
given
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-06
Junio
C Ha
m
ano
Merge
branch
'main
t
'
o
f git://repo
.
or
.
cz/g
i
t-gui into
.
.
.
commit
|
commitdiff
|
tree
2008-03-05
Jakub Nare
b
s
k
i
gitweb: Fi
x
and simp
l
i
fy pickaxe search
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
M
a
rk Levedahl
git-submodule - Allow a
d
din
g
a
s
u
b
module in-place
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Andy Whitcroft
shortlo
g
: ta
k
e the fir
s
t popu
l
ated
l
ine of
t
h
e
d
esc
r
i
ption
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
M
ichal Rokos
A
dd compat/snprintf
.
c
for sy
s
tems
tha
t
r
etu
r
n b
o
gus
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
A
l
e
x Rie
s
en
D
o no
t
us
e
GUID on
dir
in git init --shared=all on
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
C
hrist
i
an Couder
run-com
m
and: Red
i
rect stder
r
t
o a pipe before re
d
irecting
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
C
a
rlos Rica
Make bu
i
ltin-reset
.
c
use p
a
rs
e
_options
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
SZ
E
DER Gábor
bas
h
: git-bran
c
h -d
a
nd
-m lists only local b
r
anche
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
SZEDER Gábor
b
a
sh: add git-bran
c
h opti
o
n
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Cha
r
les B
a
i
ley
Add a very
b
asic test script for git
mergetoo
l
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
Teach gi
t
m
ergetool t
o
use cust
o
m
comm
a
nds defined
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Charle
s
Bailey
Changed
an i
n
ternal variable
o
f m
e
rgetool to
su
p
port
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
C
h
arles Bailey
Tidy
u
p git mer
g
etool
'
s
b
ackup file
behaviour
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
D
enis C
h
eng
log/show/
w
ha
t
changed: intr
o
duce forma
t
.
prett
y
c
o
nfigu
r
ation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
D
eni
s
Cheng
s
p
ecify
e
xplicit "--
p
retty=me
d
ium" with
`git lo
g
/show
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Denis Cheng
whatchanged do
c
ume
n
t
a
t
i
on: share de
s
c
r
i
p
t
ion of
-
-p
r
ett
y
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Junio C Ham
a
no
am:
-
-reba
s
ing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Junio C
H
amano
am: remov
e
support f
o
r
-d
.
dotes
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Junio C Hamano
am: read
from the
right
m
ailbox when sta
r
ted from a
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Junio C Hamano
fsc
k
.
c: fix bogus
"empty tree" ch
e
c
k
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Sh
a
wn O
.
Pearce
T
e
ach git-fetch to exploit
s
e
rver sid
e
automatic tag
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Shawn O
.
Pea
r
ce
Teach fetch-p
a
ck/u
p
load-pack
a
bout -
-
includ
e
-
tag
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
S
h
awn O
.
Pea
r
ce
git-
p
a
c
k
-obj
e
cts
:
Aut
o
ma
t
ical
l
y pack
anno
t
ated ta
g
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-04
Junio
C
Hamano
Reve
r
t "u
n
pa
c
k
-objects: prev
e
n
t writing of
i
nconsistent
.
.
.
commit
|
commitdiff
|
tree
2008-03-04
Junio C
Hamano
Revert "re
c
eive-pack:
use
strict
m
ode f
o
r
u
n
p
acking
.
.
.
commit
|
commitdiff
|
tree
2008-03-04
Junio C
Hamano
Merge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2008-03-04
Shawn O
.
Pearce
F
i
x 'git remote show
'
regress
i
o
n on empty reposit
o
ry
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-04
Mike
H
omm
e
y
t340
7
-rebase
-
abo
r
t
.
sh: Enhance e
x
isting tests, and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-04
Simon H
a
usmann
git-p4: Fix
i
mpor
t
of chang
e
set
s
with fil
e
deletions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-04
Alex Rie
s
en
F
i
x t
e
st
f
o
r clea
n
up failure
in t7
3
0
0 on
W
indows
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-04
J
u
nio C
Hamano
t6120 (d
e
scribe): check --lo
n
g prope
r
ly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-04
Shawn O
.
Pearce
Ad
d
git-d
e
scribe te
s
t for
"
v
erify annotated tag
nam
e
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-04
Sh
a
wn O
.
Pearce
Test for
pack
e
d
tag
s
i
n
git-describe output
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-04
S
h
awn O
.
Pea
r
ce
Don't
a
l
l
ow git-
d
escri
b
e f
a
ilures to go unn
o
tice
d
in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
Junio C Ham
a
no
describe:
r
e-fix dis
p
lay
_
name
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
Matt
h
i
e
u
Moy
Fix in
c
orrect
wording in git
-
mer
g
e
.
txt
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
G
e
rrit
P
ape
git-merge
.
sh: be
t
ter handl
i
ng
of combi
n
ed --s
q
ua
s
h
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
Mike Homme
y
Fix random
crashes in http_cleanup()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
Junio C Hama
n
o
d
e
scr
i
be: fix --long output
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
Junio C Hamano
g
i
t-describe:
u
s
e ta
g
s found in pack
e
d-refs corr
e
ctly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
Brand
o
n Case
y
t3903-stas
h
.
s
h: Ad
d
te
s
ts for new s
t
ash comm
a
nds drop
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
Brandon Casey
git-re
f
log
.
txt:
Document
new comm
a
nds --up
d
ateref and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
Brandon Ca
s
e
y
t3903-stash
.
sh
:
Add
mi
s
s
i
n
g '&&'
to
body of testcase
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
Junio C Hamano
Merge commit '74359821'
i
n
t
o
j
s
/re
f
log-delete
commit
|
commitdiff
|
tree
2008-03-03
Martin Koeg
l
er
fetch-pack: c
h
eck par
s
e
_
commit
/
object resul
t
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
Junio C Hamano
de
s
cribe --
a
lways: fall bac
k
to showin
g
an
abbreviated
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next