repo.or.cz
/
git.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
t
raverse_trees_recu
r
sive()
:
pr
o
pagate merg
e
errors up
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-09
Linus Torvalds
unpack_
t
rees(): mino
r
memory
l
eak fix in unused
d
e
s
ti
n
ation
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-09
Linus
Torvalds
Make 'unp
a
ck
_
trees()' ha
v
e a separ
a
te s
o
urce
an
d
de
s
t
i
nation
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-09
Li
n
us
T
orva
l
ds
Make 'unpack
_
t
r
ees()' take the index to work on as
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-09
Linus Torv
a
lds
Add
'const'
w
here appropriate
to index
h
andling functi
o
ns
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-09
Linus Torvalds
Fi
x
t
r
ee-walking compare_entry(
)
in
t
h
e
p
r
esense of
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-09
Linus
T
orvald
s
Move
'
u
np
a
ck_t
r
ees()
'
over
t
o
'traverse_trees()' interface
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-09
Linus Torvald
s
Make 'trave
r
se
_
t
r
e
es()'
traverse conflicting DF
e
ntries
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-09
Linus Torv
a
lds
A
d
d return v
a
lue to 'traverse_t
r
ee()' ca
l
lback
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-09
L
inus Torvalds
Ma
k
e 'trave
r
s
e
_tree()'
use lin
k
e
d
struc
t
ure rat
h
e
r
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-09
L
i
nus Torvalds
Add 'df_name_co
m
pare()'
h
el
p
er function
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-09
J
eff King
Add a test for rea
d
-t
r
e
e -u -
-
reset wi
t
h a D/F conflict
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-09
Juni
o
C Hamano
Merge branc
h
'ph/parseopt'
commit
|
commitdiff
|
tree
2008-03-09
J
u
nio C Hama
n
o
Merge branch 'dp/clean-f
i
x
'
commit
|
commitdiff
|
tree
2008-03-09
Junio
C Hamano
Merge
bran
c
h 'ml/submodule-add-existing'
commit
|
commitdiff
|
tree
2008-03-09
J
u
nio C Hamano
Merge branch 'mr/c
o
mpat-snprintf'
commit
|
commitdiff
|
tree
2008-03-09
J
unio C Hamano
Merge b
r
anch 'sp/f
e
tch-optim'
commit
|
commitdiff
|
tree
2008-03-09
J
uni
o
C Hamano
Merge branch
'jc/describe-al
w
ays'
commit
|
commitdiff
|
tree
2008-03-09
Junio
C Hamano
Merge
branch 'jc/a
m
'
commit
|
commitdiff
|
tree
2008-03-09
Ju
n
io C Hamano
Merge bran
c
h
'
c
r/reset-parseopt'
commit
|
commitdiff
|
tree
2008-03-09
J
unio C
H
am
a
no
Merge branch 'jn/git
w
eb
-
pickaxe'
commit
|
commitdiff
|
tree
2008-03-09
Junio
C Hamano
Merge branch 'kb/maint
-
filter-branch-di
s
appear'
commit
|
commitdiff
|
tree
2008-03-09
Juni
o
C
Hamano
Merge
b
ranch 'main
t
' to sync w
i
th 1
.
5
.
4
.
4
commit
|
commitdiff
|
tree
2008-03-09
Junio
C Hamano
GIT 1
.
5
.
4
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-09
S
a
n
t
i Béjar
ident
.
c
: rewor
d
e
r
r
or
messag
e
when the user n
a
me cannot
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-09
John Go
e
rz
e
n
Fix d
c
om
m
it, rebase when
r
e
writeRoot i
s
in use
commit
|
commitdiff
|
tree
2008-03-08
Junio C Ha
m
an
o
filte
r
-branch: hand
l
e "di
s
appearing tree" case corre
c
tly
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-08
C
h
arles
Ba
i
ley
me
r
ge
-
tool documentation: describe custom command
u
sage
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-08
Charles Bailey
git-mergetool
documentaito
n
: show toolnames in typewr
i
t
e
r
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-08
Ade
o
da
t
o Simó
Rea
l
ly make
t
he
L
F after reset in fast
-
im
p
ort o
p
tional
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-08
Ju
n
io C Hamano
Merge branch 'aw/mai
n
t
-shortlog-blank-lines'
commit
|
commitdiff
|
tree
2008-03-08
J
unio C Hamano
M
e
rge br
a
nch
'mh
/
maint-http-
p
roxy-
f
ix' into
m
a
i
n
t
commit
|
commitdiff
|
tree
2008-03-08
J
un
i
o C
H
a
mano
Merge branc
h
'js/maint-d
a
em
o
n' i
n
t
o
maint
commit
|
commitdiff
|
tree
2008-03-08
Junio C Haman
o
Mer
g
e branch 'js/m
a
int-cvsexp
o
rt' into ma
i
nt
commit
|
commitdiff
|
tree
2008-03-08
Junio C H
a
m
an
o
Merge
branch 'jc/main
t
-log-
m
erg
e
-left-right
'
into maint
commit
|
commitdiff
|
tree
2008-03-08
Juni
o
C Hamano
Merge branch 'ew/maint-s
v
n-
c
ert-fileprovid
e
r
'
into
.
.
.
commit
|
commitdiff
|
tree
2008-03-08
Junio C
H
amano
Merge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2008-03-08
J
unio C Haman
o
send-email: --no-si
g
ned-off-cc shoul
d
suppress 'sob' c
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-08
J
u
n
io C Hamano
Merge branch 'js/reflog
-
delete
'
commit
|
commitdiff
|
tree
2008-03-08
Junio
C
Hamano
Merg
e
branch 'dc/forma
t
-pretty'
commit
|
commitdiff
|
tree
2008-03-08
Junio C Haman
o
Merge branch 'cb/merg
e
t
ool'
commit
|
commitdiff
|
tree
2008-03-08
J
unio C Hamano
g
i
t
-cl
e
an: a
d
d tests for relative path
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-08
Dmitry
P
o
t
apov
git-clea
n
:
c
orr
e
ct pr
i
nting
relative
path
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-08
Dmit
r
y Potapov
Make priv
a
te quote_pa
t
h() in wt-statu
s
.
c availab
l
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-07
Pie
r
re
H
abouzit
unquote_c_style: fix
off-by-
o
ne
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-07
Junio C Ham
a
n
o
test
-
li
b
: fix TER
M
to
dumb f
o
r
test repeat
a
bili
t
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-07
Uwe
K
leine-König
confi
g
.
txt: ref
e
r to
-
-
u
p
load-p
a
ck and
--rece
i
ve-p
a
ck
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-07
Jun
i
o
C
Hamano
Merge
branch '
a
r/s
g
id-bsd'
commit
|
commitdiff
|
tree
2008-03-07
Junio C
Ham
a
no
Merge br
a
n
ch 'cc/run-co
m
m
and'
commit
|
commitdiff
|
tree
2008-03-07
Junio C
Ham
a
no
Revert part of d
0
89eba
(se
t
up: sanitize absolute and
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-07
J
u
nio C Ha
m
a
n
o
Revert part of 1
a
bf095
(
git-
a
dd
:
adjust to the get_pathspec
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-07
Junio
C H
a
mano
Revert part of 744d
a
cd (builtin-mv
:
minimum f
i
x to
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-07
Junio C Hamano
get_path
s
pe
c
(
)
: die when
an
o
ut-of
-
tree path is given
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-06
Juni
o
C
Hamano
Merge branch 'ma
i
n
t
'
of git:
/
/repo
.
or
.
cz/git-gui
into
.
.
.
commit
|
commitdiff
|
tree
2008-03-05
Jakub Narebski
gitw
e
b: Fix and
si
m
plify pickaxe search
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-05
M
ark Le
v
edahl
git-submodule - Allow ad
d
ing
a submo
d
ule in-place
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-05
Andy Whit
c
ro
f
t
sho
r
tlog: tak
e
the firs
t
populated
l
ine of the
descrip
t
ion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-05
M
ichal Rokos
Ad
d
co
m
p
a
t
/snprint
f
.
c for systems that retu
r
n bogus
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-05
Alex Riesen
Do not use GU
I
D on
dir in gi
t
init --shared
=
a
l
l o
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-05
C
h
ristian C
o
uder
run-com
m
and: Redirect s
t
derr to
a
pi
p
e before re
d
irecting
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-05
Car
l
os Rica
Make bui
l
t
i
n-reset
.
c use pa
r
se_options
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-05
SZEDER
G
ábor
ba
s
h: gi
t
-
bran
c
h
-d and
-m lists only
local branc
h
es
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-05
S
ZEDER Gábor
b
as
h
:
a
dd g
i
t-branch options
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
Add a ve
r
y ba
s
ic test sc
r
ipt for git mer
g
etool
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-05
Charl
e
s Bailey
Teach
git mergetool
t
o use custom commands
d
efined
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-05
Charl
e
s Bailey
C
h
anged an internal variable
o
f mergetool to su
p
port
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
T
i
dy up g
i
t
mergeto
o
l's backup file behaviour
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-05
Denis Cheng
l
og/show/whatchanged: introduce format
.
pre
t
ty
c
onfiguration
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-05
D
enis C
h
eng
sp
e
ci
f
y explicit "--pretty=medium"
w
ith `
g
i
t
log/show
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-05
Denis Cheng
what
c
hanged
documentation: share description of --pretty
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-05
J
u
n
i
o
C
Hamano
am: --rebas
i
ng
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-05
Junio C Hamano
a
m
: remove support f
o
r -d
.
do
t
est
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-05
Juni
o
C
Hamano
am: read from t
h
e right
mailbox when sta
r
t
ed from a
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-05
J
unio C Ha
m
ano
fsck
.
c: fix b
o
g
u
s
"
e
mpty tre
e
" check
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-05
Shawn
O
.
Pe
a
rce
Teach
g
it-fetch
t
o
exp
l
oit server side au
t
omatic t
a
g
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-05
Shaw
n
O
.
P
earce
Teach fetch-pa
c
k/
u
p
load-p
a
ck about -
-
include-tag
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-05
Shawn O
.
Pe
a
r
ce
git
-
p
a
ck
-
objects: Autom
a
tically pa
c
k annotated t
a
gs
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-04
J
unio C H
a
mano
Revert "unpa
c
k-objec
t
s
: prevent writing
of inco
n
sistent
.
.
.
commit
|
commitdiff
|
tree
2008-03-04
J
u
n
io C Hamano
Revert "receive
-
pack: use strict mode for u
n
packi
n
g
.
.
.
commit
|
commitdiff
|
tree
2008-03-04
Ju
n
io C Ham
a
no
Merge
b
ranch '
m
a
i
nt'
commit
|
commitdiff
|
tree
2008-03-04
Sh
a
wn O
.
Pearce
Fix 'git re
m
ote show' re
g
ression on empty
r
epos
i
t
o
ry
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-04
Mike Hommey
t3407-rebas
e
-abort
.
s
h: E
n
hance exis
t
ing tests, and
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-04
Simon Hausmann
gi
t
-p4:
F
ix import of changesets w
i
t
h file deletions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-04
Alex Riesen
Fix test f
o
r cleanup failur
e
in t
7
300 on Windows
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-04
Junio C Ham
a
no
t6
1
20 (de
s
cribe): check --long
properly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-04
Shawn O
.
Pe
a
rce
Add git-descr
i
be
test fo
r
"verify
a
n
n
ot
a
t
e
d
tag
n
ames
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-04
Shawn O
.
Pea
r
ce
Tes
t
for p
a
cke
d
tags in git-de
s
cribe output
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-04
Shawn
O
.
P
earce
Don't allo
w
git-des
c
ribe f
a
ilu
r
es to go
u
nnoticed in
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-03
Junio C
H
aman
o
descri
b
e
: re-fix display_name()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-03
M
a
tthieu M
o
y
Fix incorrect word
i
n
g
in git-merge
.
t
x
t
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-03
Gerrit Pape
git-me
r
ge
.
sh: bet
t
er han
d
ling of combined
--squ
a
sh
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-03
Mike
Hommey
Fix random crashes in http_
c
lea
n
u
p()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-03
J
unio C Hamano
describe: f
i
x --long o
u
tput
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-03
Junio
C
H
a
mano
gi
t
-
d
escribe: use ta
g
s found in
packed-refs correctly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-03
Bra
n
don Casey
t39
0
3-sta
s
h
.
sh: Add tests fo
r
n
ew
st
a
s
h comman
d
s drop
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-03
Br
a
ndon Casey
git-re
f
log
.
txt:
Docum
e
n
t new commands
--upd
a
te
r
ef a
n
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-03
Brandon Ca
s
ey
t3903-s
t
ash
.
s
h:
A
d
d missing '&
&
' to body of testcase
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-03
Junio
C Haman
o
Merge commit '74359821' into js/ref
l
og-delete
commit
|
commitdiff
|
tree
2008-03-03
Martin Koegle
r
f
e
tch-pack: check parse_commit/object results
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-03
Junio C Hamano
des
c
ribe --always: fall b
a
c
k to showi
n
g an
abbr
e
viated
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next