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
H
a
m
a
no
traverse_trees_recursiv
e
(): pro
p
agate
me
r
ge err
o
rs u
p
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
Linus Torvalds
unpack_t
r
ees():
mi
n
or mem
o
ry l
e
ak
f
ix in unus
e
d destination
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
Linus Torv
a
lds
Mak
e
'un
p
ac
k
_
t
rees()' have a separate sourc
e
and destination
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
L
inus T
o
rvalds
Make 'un
p
ac
k
_trees()
'
ta
k
e
the
i
n
dex to work on as
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
Linus Tor
v
a
lds
A
d
d 'const' wher
e
ap
p
ropr
i
at
e
to index han
d
ling
functions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
Linus To
r
valds
Fi
x
tree-
w
alkin
g
c
o
m
p
are_entry() in
t
he pre
s
ense
o
f
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
Linus Torvald
s
M
o
ve
'
unpack_trees()' ove
r
to
'traverse_t
r
ees()' interface
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
Linu
s
Torva
l
ds
Make
't
r
a
verse_t
r
ees
(
)' traverse co
n
flicting DF e
n
trie
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
Lin
u
s Torvalds
Add r
e
turn valu
e
t
o
'
traverse_tree()' c
a
llback
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
Linus Torvalds
Make
'
tr
a
verse_tree()'
u
se linked
s
tructure rath
e
r
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
Linus
Tor
v
alds
Add 'df_na
m
e_compare()' hel
p
e
r
function
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
Jeff King
Add
a
test
f
or
r
ead-tree -u --r
e
set with a
D
/F conf
l
ict
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
J
unio C
H
am
a
no
Merge bran
c
h 'ph/pars
e
opt'
commit
|
commitdiff
|
tree
2008-03-09
Junio
C Hamano
Merge branch
'
dp/clean-fix
'
commit
|
commitdiff
|
tree
2008-03-09
Junio C H
a
mano
Mer
g
e branch
'
ml/submodule-ad
d
-existing'
commit
|
commitdiff
|
tree
2008-03-09
Junio
C
H
a
mano
Merge branch 'mr/co
m
pat-snprin
t
f'
commit
|
commitdiff
|
tree
2008-03-09
Juni
o
C Hamano
Merge branch '
s
p/
f
etch-optim
'
commit
|
commitdiff
|
tree
2008-03-09
Juni
o
C
H
amano
Merge branch 'jc
/
d
escr
i
be-alway
s
'
commit
|
commitdiff
|
tree
2008-03-09
Junio C Hamano
Merge branch 'jc/am'
commit
|
commitdiff
|
tree
2008-03-09
Junio C Ham
a
n
o
Merge
branch 'c
r
/reset-
p
a
r
s
eo
p
t'
commit
|
commitdiff
|
tree
2008-03-09
Junio C Hama
n
o
Merge bran
c
h 'jn/gitweb-pickaxe'
commit
|
commitdiff
|
tree
2008-03-09
J
unio C Hamano
Merge
b
r
a
n
c
h
'kb/ma
i
nt-filter-branch-disappear
'
commit
|
commitdiff
|
tree
2008-03-09
Junio
C Hamano
Merge
bran
c
h
'maint' to sy
n
c
with 1
.
5
.
4
.
4
commit
|
commitdiff
|
tree
2008-03-09
J
u
nio C
Ha
m
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 message
w
hen the user name
cannot
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
John Goerzen
Fix
dco
m
mit
,
rebase when rewriteRoot is in use
commit
|
commitdiff
|
tree
2008-03-08
Junio C
Hamano
filter-branch: handle
"disa
p
p
e
aring tree" case correctly
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-08
Charles Bailey
merge-
t
ool doc
u
m
entation: descr
i
be cu
s
tom
c
ommand usage
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-08
Charles Bailey
gi
t
-
mergetool
d
o
c
u
mentaiton: show toolnames
i
n typ
e
writer
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-08
Adeoda
t
o Si
m
ó
Really
make the LF after rese
t
in fast-import
o
ptiona
l
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-08
Junio C Hamano
Merge branch 'aw/maint-short
l
og-blank-lines'
commit
|
commitdiff
|
tree
2008-03-08
Ju
n
io C Ha
m
ano
Merge bra
n
ch 'mh/
m
aint-
h
ttp-proxy-fix'
i
nto m
a
in
t
commit
|
commitdiff
|
tree
2008-03-08
J
un
i
o
C Ha
m
a
n
o
Merg
e
bran
c
h '
j
s/
m
aint-daem
o
n' into mai
n
t
commit
|
commitdiff
|
tree
2008-03-08
Junio
C
Hamano
Merge
b
ran
c
h
'js/maint-cvsexport' into m
a
int
commit
|
commitdiff
|
tree
2008-03-08
Jun
i
o C Hamano
Merge bran
c
h 'jc/ma
i
nt-log-merge-left-r
i
ght' int
o
maint
commit
|
commitdiff
|
tree
2008-03-08
Junio C Hamano
M
e
rge b
r
anch 'ew/maint-svn-cer
t
-fileprov
i
der'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2008-03-08
Junio C
Ha
m
a
no
Merge
branch 'maint'
commit
|
commitdiff
|
tree
2008-03-08
Junio C Hamano
s
e
nd-email: --no
-
signed-off
-
cc
s
h
o
u
ld sup
p
ress 'sob
'
cc
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-08
Ju
n
io C
H
amano
Merge bra
n
ch 'js/re
f
l
o
g-delete'
commit
|
commitdiff
|
tree
2008-03-08
Jun
i
o
C Hamano
M
erge branch 'dc/format-pretty'
commit
|
commitdiff
|
tree
2008-03-08
Juni
o
C
H
amano
Merge bra
n
ch
'cb/mergetool
'
commit
|
commitdiff
|
tree
2008-03-08
Junio C Hamano
gi
t
-clean: add
tests
f
or relative pa
t
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-08
Dmit
r
y P
o
t
apov
git-clean: c
o
rrec
t
printing relative path
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-08
D
m
itry Potapov
Mak
e
private quote_path() in wt-status
.
c available
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-07
Pie
r
re Habouzit
unquote_c_
s
t
y
le: fi
x
off-by-on
e
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-07
Junio C H
a
mano
test-lib: fix TERM to dumb for t
e
s
t
repeat
a
bility
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-07
Uwe
K
l
e
ine-König
config
.
txt:
refer to -
-
upl
o
ad
-
pack and --receive-p
a
c
k
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-07
Junio C Hamano
Merg
e
branch
'ar/
s
gid-bsd'
commit
|
commitdiff
|
tree
2008-03-07
Juni
o
C
Hamano
M
e
rge branch 'cc/run-co
m
m
and'
commit
|
commitdiff
|
tree
2008-03-07
Junio C Hama
n
o
Revert
part of d089e
b
a (s
e
tup: sani
t
ize absolute and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-07
Junio C
Hamano
R
e
vert part of 1abf095 (git-ad
d
: adjust
to the get_p
a
thspec
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-07
Junio C Hamano
Revert part of 744dacd
(
b
uil
t
in-mv:
minimum fix t
o
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-07
Junio
C
Hamano
get_pathspec(
)
: die when
an out-of-tree path is
g
iven
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-06
Junio C Hamano
M
e
rge branch 'm
a
i
n
t' of git://repo
.
or
.
cz/git-gui into
.
.
.
commit
|
commitdiff
|
tree
2008-03-05
Ja
k
ub
Narebski
g
i
tweb: Fix
and simp
l
ify
pickaxe search
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Ma
r
k Levedahl
git-submodule - Allow ad
d
ing
a su
b
module
i
n-place
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
A
n
d
y Whitcroft
shortlog
:
take the first
p
opula
t
e
d
line of
t
he description
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Michal Rokos
Add c
o
mpat/
s
nprintf
.
c for systems
that retur
n
bogus
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Alex
Riesen
D
o not use GUI
D
on dir in git i
n
it --shared
=
all on
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
C
hris
t
i
a
n Cou
d
er
ru
n
-comman
d
: Redirect stderr
to a pipe bef
o
re
redirecting
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Carl
o
s Ri
c
a
Make builtin-r
e
set
.
c use parse_options
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
S
Z
EDER Gábor
bash
:
git-branch -d and -m lists only local
b
r
a
n
c
hes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
S
Z
EDE
R
Gábor
bash: add git-bran
c
h
opt
i
o
ns
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Charles
B
ailey
Add a very basic test scri
p
t for gi
t
mergetool
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Charles B
a
iley
Teach git mergetool to use custom com
m
a
n
ds defin
e
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
Cha
n
ged an internal vari
a
ble of merge
t
ool to suppo
r
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Cha
r
les
Bailey
Tidy up git mergetool
'
s backup f
i
le beh
a
vio
u
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Denis
Cheng
log/show/what
c
han
g
ed: introduce
fo
r
m
at
.
pretty configuration
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Denis Che
n
g
sp
e
ci
f
y explicit "--pr
e
tty=
m
edium
"
with `git
l
og/show
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Denis Cheng
whatchanged
d
o
cumentat
i
on: share d
e
scription o
f
--pretty
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Junio
C
Hamano
am: --reb
a
sing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
J
un
i
o C
H
amano
am: remove s
u
ppo
r
t
for -d
.
dote
s
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Jun
i
o C Hamano
am: rea
d
from the right mailbox w
h
en sta
r
ted from a
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Ju
n
io C Ha
m
ano
fsck
.
c: fix b
o
gus "empty tree" check
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Sh
a
wn
O
.
Pearce
Te
a
ch
git-f
e
tch to exploi
t
server
s
ide automatic tag
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Sha
w
n
O
.
P
ear
c
e
Te
a
ch fetch-p
a
ck/uploa
d
-pa
c
k abo
u
t --include-tag
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Sha
w
n O
.
Pear
c
e
git
-
pack
-
object
s
: Autom
a
t
ically pack an
n
ot
a
ted tags
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-04
Junio
C
H
a
ma
n
o
Rev
e
rt
"unpack-objec
t
s: prevent writing of inc
o
n
s
istent
.
.
.
commit
|
commitdiff
|
tree
2008-03-04
Ju
n
io C Hamano
Revert "
r
eceive-pack: use strict
mode f
o
r
unpackin
g
.
.
.
commit
|
commitdiff
|
tree
2008-03-04
Junio C Ha
m
a
n
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-03-04
Shawn O
.
Pearce
F
i
x 'git remote show' regr
e
ssion on
empty repo
s
itory
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-04
M
ike
Hommey
t340
7
-rebase
-
abort
.
s
h
: Enhance existing tests, and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-04
Simon
Hausmann
git-p4: F
i
x
im
p
ort o
f
changesets with file deleti
o
ns
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-04
Alex Riese
n
Fix te
s
t for
c
le
a
nup fa
i
l
ure in t73
0
0 o
n
Windows
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-04
Junio
C
H
a
ma
n
o
t6120 (descr
i
be):
c
he
c
k --long pro
p
e
r
ly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-04
S
h
a
wn O
.
Pearce
Add gi
t
-describe
t
est for "verify anno
t
a
t
ed tag
n
a
m
es
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-04
S
h
awn O
.
Pearce
Test
f
o
r
packed
tags in git-describe
outpu
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-04
Shawn O
.
P
earce
Don'
t
allow git-d
e
sc
r
ibe f
a
ilures t
o
go unno
t
iced in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
Junio C
Haman
o
descr
i
be: r
e
-
fix
d
isplay_n
a
me()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
Matt
h
i
e
u Moy
Fix incorrec
t
wording
in
g
it-merge
.
txt
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
Gerrit Pape
git-merg
e
.
sh:
better handling o
f
combined --squ
a
sh
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
M
ike H
o
mmey
F
ix rand
o
m c
r
ashes in
h
ttp_cle
a
nu
p
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
J
unio C H
a
mano
descri
b
e
: fix --long ou
t
pu
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
J
u
nio C Hama
n
o
g
i
t
-descr
i
be: use
tags fo
u
nd in pa
c
ked
-
refs c
o
rrectly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
Bran
d
on
C
a
sey
t3903-st
a
sh
.
s
h
:
A
dd te
s
ts for new stas
h
commands drop
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
Brandon C
a
sey
gi
t
-
reflog
.
txt: Docum
e
nt
new commands
--updater
e
f and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
Brandon Casey
t3903-stash
.
s
h: Ad
d
missing '&&' to body of testcase
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
Ju
n
io C Hamano
Merge commit '7
4
359821' into js/
r
eflog-delete
commit
|
commitdiff
|
tree
2008-03-03
Martin Koegler
fetch-pack: check par
s
e_commit/objec
t
results
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
J
u
ni
o
C Ha
m
ano
describe --alw
a
ys: fall
back to showi
n
g an abbreviated
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next