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
Junio C Hamano
traverse_t
r
ees_recursive(): propagate merge
e
rror
s
up
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
L
inus Torvalds
u
n
pack_trees():
m
i
nor memory leak
f
ix i
n
unused
d
estination
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
Linus To
r
valds
M
a
ke 'unpac
k
_trees()' have a
separate sour
c
e and desti
n
ation
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
Lin
u
s
T
o
rvalds
Mak
e
'
un
p
ack_tree
s
()'
take the i
n
dex to work
on as
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
Linus T
o
rvalds
Add 'const' wh
e
r
e
appro
p
ria
t
e
to
i
ndex han
d
ling
f
unctions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
Linus Torvalds
F
i
x
t
ree-walking compare_entr
y
() in the pre
s
ense of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
Linus Torvalds
Move 'unpa
c
k_trees()'
over to 't
r
ave
r
se_tree
s
()' inter
f
ace
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
L
i
nu
s
Tor
v
alds
Make 'traverse
_
trees(
)
' traver
s
e
conflict
i
ng DF
e
ntri
e
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
Li
n
us Torvalds
Add r
e
turn value to '
t
raverse_tree()' callback
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
Linus Torv
a
l
ds
Make 'traverse_tree()' use li
n
ked structure rath
e
r
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
Linus
Torvalds
Add 'df_name_
c
ompare()' helper funct
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
Jeff King
Add a
t
est f
o
r read-tree -u --re
s
e
t
with a D/F conflic
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
Junio C Hamano
Merg
e
branch
'
ph/parseopt'
commit
|
commitdiff
|
tree
2008-03-09
Jun
i
o C Hamano
Merge b
r
anch '
d
p
/cl
e
an-fix'
commit
|
commitdiff
|
tree
2008-03-09
Junio C H
a
mano
Merge
b
ra
n
ch 'ml/
s
ubmodule-add-existing'
commit
|
commitdiff
|
tree
2008-03-09
Juni
o
C
H
aman
o
M
erg
e
b
r
an
c
h 'mr/
c
omp
a
t-sn
p
rintf'
commit
|
commitdiff
|
tree
2008-03-09
J
unio C Hamano
Merge b
r
an
c
h
'
s
p/
f
etch-optim'
commit
|
commitdiff
|
tree
2008-03-09
J
u
nio C Hamano
Merge bra
n
c
h 'jc/
d
escribe
-
alw
a
ys'
commit
|
commitdiff
|
tree
2008-03-09
Juni
o
C Hamano
Merge b
r
anch 'jc/am'
commit
|
commitdiff
|
tree
2008-03-09
Juni
o
C Hamano
Me
r
g
e
b
ranch 'cr/reset-
p
arseo
p
t'
commit
|
commitdiff
|
tree
2008-03-09
Junio
C
Hamano
Me
r
ge branch '
j
n/gitweb-pickaxe'
commit
|
commitdiff
|
tree
2008-03-09
Junio C Haman
o
Merge branch 'kb/mai
n
t
-
filter-branch-
d
isappea
r
'
commit
|
commitdiff
|
tree
2008-03-09
Junio C Hama
n
o
Me
r
ge
bran
c
h
'
m
a
i
nt' to sync with
1
.
5
.
4
.
4
commit
|
commitdiff
|
tree
2008-03-09
Junio C Ham
a
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
mess
a
ge when
t
he
u
s
er na
m
e
cannot
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
J
ohn Goerz
e
n
F
i
x dcommit, rebase when r
e
writeRoot is in use
commit
|
commitdiff
|
tree
2008-03-08
Junio
C
H
amano
f
ilter-branch: handle "d
i
sappearing tree"
case correctly
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-08
Ch
a
r
le
s
Bailey
merge-tool docum
e
ntation: describe cu
s
t
o
m command usage
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-08
Ch
a
rle
s
B
a
iley
git
-
mergetool documentaito
n
:
show tool
n
ames
i
n typewriter
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-08
Adeodato Si
m
ó
Re
a
lly make the LF after r
e
set i
n
f
ast-im
p
ort optional
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-08
Junio C Hamano
Mer
g
e
branch 'aw/main
t
-shortlog-blank-
l
i
nes'
commit
|
commitdiff
|
tree
2008-03-08
Junio C
Hamano
Merge
branch 'mh/mai
n
t-h
t
t
p
-
p
r
oxy-fix' into maint
commit
|
commitdiff
|
tree
2008-03-08
Junio C Hamano
Merge
branch 'js/main
t
-daemon' into m
a
int
commit
|
commitdiff
|
tree
2008-03-08
Junio C Ha
m
ano
M
e
rge branch '
j
s
/maint
-
cvsexport' into maint
commit
|
commitdiff
|
tree
2008-03-08
J
u
nio C
Hamano
Merge bran
c
h 'jc/maint-lo
g
-merge
-
le
f
t-right'
i
nto ma
i
nt
commit
|
commitdiff
|
tree
2008-03-08
Junio C Hamano
Merge
b
ranc
h
'ew/m
a
int
-
svn-cert-fileprovid
e
r' into
.
.
.
commit
|
commitdiff
|
tree
2008-03-08
J
u
nio C Hama
n
o
Merge branch '
m
aint'
commit
|
commitdiff
|
tree
2008-03-08
Junio
C
H
amano
send
-
email: --no-s
i
gned-off-cc sh
o
uld
s
uppress
'
sob' cc
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-08
Ju
n
io C Hamano
Merge bra
n
ch 'js/r
e
flog-delete'
commit
|
commitdiff
|
tree
2008-03-08
Junio C Hamano
Merg
e
bra
n
ch
'dc/format-
p
r
e
tty'
commit
|
commitdiff
|
tree
2008-03-08
Junio C Hamano
Merge
branch 'cb/merget
o
o
l
'
commit
|
commitdiff
|
tree
2008-03-08
Juni
o
C Hamano
git-clean:
add te
s
ts
f
or relat
i
v
e p
a
t
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-08
D
mitry Potapov
git
-
clean: co
r
rect
p
rinting relati
v
e p
a
th
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-08
Dmi
t
ry Potapov
Make private quote
_
path() in
wt-status
.
c available
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-07
Pi
e
rre Habouzi
t
u
n
quote_c_style: fix off-by-
o
ne
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-07
J
u
nio C Hamano
test-lib:
fix
T
ERM to
dum
b
for
t
e
st repeatab
i
lity
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-07
Uwe Kleine-Kön
i
g
con
f
ig
.
txt: refer to --upload-pack a
n
d
-
-r
e
c
e
ive-pack
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-07
Junio C Hamano
Me
r
g
e
b
ranch 'ar/sg
i
d-bsd'
commit
|
commitdiff
|
tree
2008-03-07
Junio
C Hamano
Me
r
ge branch 'cc/run-command'
commit
|
commitdiff
|
tree
2008-03-07
J
u
nio C Hamano
Rev
e
rt
p
art of d089
e
ba (se
t
up: sanitize absolute and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-07
Ju
n
io C H
a
mano
Revert part
of 1abf0
9
5 (g
i
t-ad
d
: adjust to t
h
e g
e
t_pathspec
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-07
J
u
nio C Hamano
Rev
e
rt part of 744dacd (bu
i
ltin
-
mv: minimu
m
fix to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-07
Junio C Hamano
get_pathspe
c
(): die
when an out-of-tr
e
e
p
ath is given
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-06
Junio C
Hamano
Merge
branch
'
maint' of git://re
p
o
.
or
.
cz/git
-
gui into
.
.
.
commit
|
commitdiff
|
tree
2008-03-05
Jakub Narebski
gitweb: Fix
and simplify p
i
ckaxe searc
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
M
a
rk
L
evedahl
git
-
subm
o
dule - Allow adding a
submodule in-
p
lace
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
A
ndy Whitc
r
oft
s
hortlog:
t
ake th
e
first po
p
u
l
ated
line
of the d
e
s
c
ription
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Mich
a
l Rokos
Add c
o
mpa
t
/
snprin
t
f
.
c
for systems that re
t
u
r
n
bogus
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Al
e
x Riesen
Do
not
u
se GU
I
D on
dir in
g
it
i
nit --
s
hared=
a
ll
o
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Christian Coude
r
r
u
n-command: Redi
r
ect stderr to a pipe befor
e
redire
c
ting
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Carlos Rica
Make builtin-res
e
t
.
c use
parse_optio
n
s
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
SZEDER Gábo
r
bash
:
gi
t
-
branch -d
and -m li
s
ts only l
o
cal branches
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
SZEDE
R
Gábor
bash: ad
d
g
i
t-b
r
anch opt
i
ons
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Charles
Baile
y
Add
a
v
ery basic test script for git
mergetool
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
C
harles Bailey
Teac
h
git m
e
rge
t
ool to use cus
t
om commands defined
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
C
h
a
r
l
e
s Bailey
Changed an interna
l
variable of m
e
rgetool
to s
u
pport
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Cha
r
les Bailey
Tidy up git mer
g
e
t
ool'
s
back
u
p file behaviou
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Denis Cheng
log/
s
how/w
h
a
tc
h
anged: introduce
format
.
pretty c
o
nfiguration
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
D
e
n
i
s
C
heng
specify
explici
t
"--pret
t
y=m
e
diu
m
" with `
g
it l
o
g/show
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Denis Cheng
w
h
atch
a
nged d
o
cumentation
:
share
description of --prett
y
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Junio C
Hamano
a
m
: --r
e
basin
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Junio C Hamano
am
:
remove supp
o
rt for -d
.
dotest
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Jun
i
o C Hamano
am: read from the right
mailbox whe
n
started from a
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Junio C Ha
m
a
n
o
f
sck
.
c: fix
bogus "emp
t
y tree"
c
heck
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Shawn O
.
Pearc
e
Tea
c
h git-fetch
t
o e
x
plo
i
t server side automatic tag
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Shaw
n
O
.
Pear
c
e
Te
a
ch fet
c
h-pack/upload-pac
k
about --include-ta
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
S
h
a
w
n O
.
Pea
r
ce
git-p
a
ck-obje
c
ts:
Automatically pack annotated tags
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-04
Junio C
H
amano
Revert "unpac
k
-o
b
jects: prevent writing of inco
n
sistent
.
.
.
commit
|
commitdiff
|
tree
2008-03-04
Junio C Hamano
Revert "receive-pack: use
strict mode for unpacking
.
.
.
commit
|
commitdiff
|
tree
2008-03-04
Junio C Ham
a
n
o
M
e
r
ge branch
'maint'
commit
|
commitdiff
|
tree
2008-03-04
Sh
a
wn O
.
Pe
a
rce
Fix
'git remote sh
o
w' re
g
re
s
s
i
o
n
o
n empty repository
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-04
Mike Hommey
t
34
0
7-reb
a
s
e
-abort
.
sh
:
Enhance existing
t
ests, and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-04
Simon
H
ausm
a
n
n
git-p4:
Fix i
m
port of
c
h
ang
e
se
t
s
with
file
d
e
l
etions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-04
Ale
x
Ri
e
s
en
F
i
x t
e
st fo
r
cleanup failure in t73
0
0 o
n
Wi
n
dows
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-04
Junio C Hamano
t6120 (descri
b
e
)
:
check --long pr
o
p
e
r
ly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-04
Shawn O
.
Pearce
Add git-describe test for "
v
erify annotated ta
g
names
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-04
Shawn O
.
Pearce
Test fo
r
packed tags in git
-
describe ou
t
put
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-04
Shawn O
.
P
e
arce
D
o
n'
t
allow
g
it
-
d
escri
b
e fail
u
re
s
to go unnot
i
ced i
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
Junio
C Ham
a
no
de
s
cri
b
e: re-fix display_name()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
Ma
t
thieu Moy
Fix i
n
correct wor
d
ing in
g
it-merge
.
txt
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
Ger
r
i
t
Pap
e
git-merge
.
sh:
b
etter handling of com
b
ined --s
q
u
a
sh
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
Mi
k
e Hom
m
e
y
F
ix random crashes i
n
htt
p
_clean
u
p()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
Ju
n
io C Hamano
describe: fix --long
o
u
t
put
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
Ju
n
io C Hamano
git-d
e
scr
i
be:
use tags
f
o
u
nd in
p
a
cked-refs correctly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
B
r
a
n
d
on Casey
t3903-stash
.
sh: Add tests for new stash com
m
and
s
drop
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
Brandon
Casey
g
i
t
-reflog
.
txt:
D
o
c
ument
new commands
-
-updatere
f
and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
Brandon Casey
t
3903-stash
.
sh: Add m
i
s
s
ing '&
&
'
t
o b
o
d
y of t
e
stcase
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
J
unio C
Hamano
Merge commit '74359821' into js/reflog-de
l
ete
commit
|
commitdiff
|
tree
2008-03-03
Mart
i
n Koegler
fetch-p
a
ck: check parse_c
o
mmi
t
/object results
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
Junio C Hama
n
o
d
e
sc
r
ibe --alwa
y
s:
fall back to showing an abbreviated
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next