repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Split out merge_recursive() to merge-recursive.c
2008-08-31
Miklos
Vajna
Sp
l
it out
merge
_
recu
r
si
v
e()
t
o merge-re
c
ursive
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Juni
o
C Haman
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-08-31
Junio C Hamano
gita
t
tributes: -cr
l
f
i
s not bi
n
ary
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
Junio C Hamano
git-apply: Loosen "ma
t
ch_be
g
inning" logic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
Junio C Hamano
Fi
x
exam
p
le
i
n git-na
m
e
-
rev doc
u
mentation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
J
u
nio C Hamano
Merge bra
n
c
h
'sp/missing-thin-base' into mai
n
t
commit
|
commitdiff
|
tree
2008-08-30
Junio C Hamano
Merg
e
bran
c
h 'sb/daemo
n
'
commit
|
commitdiff
|
tree
2008-08-30
Juni
o
C
H
am
a
no
Merge branch
'af
/
maint-install-no-handlink' into maint
commit
|
commitdiff
|
tree
2008-08-30
Junio C
H
amano
s
h
ell:
d
o not play duplicated
d
efiniti
o
n
games
to shrink
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
Alex Ries
e
n
Fix use of hardlinks in "
m
ake install"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
J
un
i
o C Hamano
Merge branch 'np/verify-pack' in
t
o maint
commit
|
commitdiff
|
tree
2008-08-29
Junio C Hamano
Merge b
r
anch
'ma
i
nt'
commit
|
commitdiff
|
tree
2008-08-29
T
or
A
rvid Lund
g
i
t-
p
4:
Fix checkout
b
ug when using --import
-
local
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
P
aolo C
i
arrocchi
tuto
r
ial: g
e
n
t
ler illustrat
i
on of A
l
i
ce/
B
ob wo
r
kf
l
ow
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
J
eff King
pretty=f
o
rmat: respec
t
da
t
e for
m
at options
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Pao
l
o Bonz
i
ni
m
a
k
e gi
t
-shell
p
ara
n
oid about
close
d
stdin/stdout/stder
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Yann Dirson
D
ocument gitk
--args
c
md
fla
g
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
L
i
nus
To
r
valds
Fix '--dirstat' with cross-directo
r
y renaming
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Björn Steinbrink
for-each
-
ref: Al
l
o
w
a trailing slash
in the patt
e
rns
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Alex Riese
n
l
ist_c
o
mmands: only call git_exec_p
a
th if
i
t is need
e
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Alex Riesen
Allow git help work without PATH set
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Alex Riesen
Make ma
i
n_c
m
ds and
o
ther_cmds l
o
cal to builtin-help
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
A
lex Ri
e
sen
Remove
u
seless mem
s
et of
s
tatic command
n
ame
l
ists
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
A
l
e
x
Riesen
Re
m
ove c
a
lcula
t
io
n
of the l
o
ngest
c
o
mmand name f
r
om
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Brandon Casey
dir
.
c
: Avoid c99
array initia
l
i
z
ation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Matthia
s
Kestenholz
bash-comple
t
ion: Ad
d
a
ll submodule subco
m
man
d
s to the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-28
J
u
nio C Hamano
Merge
b
r
a
nch 'mv/me
r
ge
-
custom'
commit
|
commitdiff
|
tree
2008-08-28
Junio C Hamano
Merge branch 'm
l
/submo
d
ule'
commit
|
commitdiff
|
tree
2008-08-27
Junio
C
Hamano
Merge bran
c
h 'am/c
h
erry
-
pic
k
-rerere'
commit
|
commitdiff
|
tree
2008-08-27
Junio
C
Hamano
Merge branch '
j
c/add-add
r
emove'
commit
|
commitdiff
|
tree
2008-08-27
Junio C H
a
mano
Merge br
a
nch 'np/verify-pack'
commit
|
commitdiff
|
tree
2008-08-27
Junio C Haman
o
Merge br
a
nch 'da/submodu
l
e-sy
n
c'
commit
|
commitdiff
|
tree
2008-08-27
Junio
C
Ha
m
ano
M
erge
branch 'maint'
commit
|
commitdiff
|
tree
2008-08-27
Junio
C Hamano
ctype
.
c: pr
o
t
e
ct
t
i
n
y C prepr
o
cessor co
n
st
a
nts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-27
Linus T
o
rvalds
ind
e
x-p
a
ck: be careful af
t
er fixing up the header/footer
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-27
Simon Hausmann
Mak
e
it p
o
s
s
ible
t
o abor
t
the sub
m
i
s
sion of
a
change
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-27
Jun
i
o C Hamano
Merge branch 'af/ma
i
nt-install-no-handli
n
k'
commit
|
commitdiff
|
tree
2008-08-27
Junio
C Haman
o
Mer
g
e bran
c
h 'jc/no-slim-shell'
commit
|
commitdiff
|
tree
2008-08-27
J
u
nio C Hamano
Mer
g
e
branch '
m
a
int'
commit
|
commitdiff
|
tree
2008-08-27
Jeff Kin
g
format-p
a
tch: use def
a
ult diff for
m
a
t
even w
i
th patch
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-26
Nguyễn Thá
i
Ngọc
D
uy
index-pack:
s
etup
git repository
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-26
Ramsay Jones
Suppress some bash r
e
direction e
r
ror messages
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-26
Ramsay Jones
Fix a warning (o
n
c
y
g
win)
to allow -Werror
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-26
Andreas Färber
Make
f
il
e
: al
w
ays provide a
f
allback when h
a
r
dli
n
ks
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-26
Junio C
H
a
m
ano
daemon
.
c: min
o
r
st
y
le fixu
p
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>:
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-26
David Aguil
a
r
git-submodule
:
add "sync" comma
n
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-26
Junio C Hamano
R
e
v
e
rt "Build-i
n
"
g
i
t-shell""
commit
|
commitdiff
|
tree
2008-08-25
Jeff King
F
ix
"
git log -i --grep"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Tommi Virta
n
en
I
n
s
tall
git-shell in
bindi
r
, t
o
o
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Jun
i
o C Hamano
Merge b
r
an
c
h
'jc/no-slim-shell'
commit
|
commitdiff
|
tree
2008-08-24
Junio C Hamano
Merge branch 'maint
'
to sync with 1
.
6
.
0
.
1
commit
|
commitdiff
|
tree
2008-08-24
J
unio C Hamano
GIT 1
.
6
.
0
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Juni
o
C Haman
o
Merge branch 'ag/m
a
int-
c
ombine-dif
f
-fix' int
o
main
t
commit
|
commitdiff
|
tree
2008-08-24
Junio C Hama
n
o
Merge branch 'mv/m
a
i
n
t-
m
erge-fix' into main
t
commit
|
commitdiff
|
tree
2008-08-24
M
ark Leveda
h
l
git-subm
o
dule - Us
e
"get_default_remote"
f
rom
g
i
t-parse
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Jona
t
han Nieder
D
ocume
n
tation: cla
r
ify pager co
n
f
iguration
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Jon
a
tha
n
Nieder
Documen
t
ati
o
n: clarify p
a
g
er
.
<cmd> configuration
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Simon Hausmann
Cle
a
n
up the gi
t
-p4 documentation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Alex
a
nder Gavrilo
v
Respect core
.
auto
c
r
l
f
i
n c
o
m
bine
d
diff
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Miklos V
a
j
n
a
Makefile:
e
nable
S
NPRIN
T
F_RETURNS_B
O
GUS
f
o
r
HP-U
X
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Junio C Hama
n
o
t7
6
0
6
: f
i
x custom merge
tes
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
J
u
n
io C
H
amano
Merge branc
h
'maint'
commit
|
commitdiff
|
tree
2008-08-24
Junio
C Hamano
merge: fix nu
m
erus
bugs
aro
u
nd
"
trivial merg
e
" area
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Juni
o
C Hama
n
o
u
npack_trees(): prote
c
t the
handcrafted in-core index
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-23
To
r
Arvid
Lund
git-p4:
F
ix one-liner in p4
_
write_pipe
function
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-23
David Aguilar
git-submo
d
ule: repla
c
e duplicated co
d
e with
a
module_
l
i
s
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-23
N
i
cola
s
Pitre
discard revindex data when pack list ch
a
nges
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-23
Dan
H
e
nsg
e
n
git-merge document
a
tion
:
more details a
b
out resol
v
in
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-23
Alex Ri
e
sen
Exte
n
d "ch
e
ckout
-
-t
r
ack" DW
I
M
t
o support m
o
re
c
ases
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Jonathan
de
l
Strothe
r
Rev
e
rt
"
Convert output messages
i
n
mer
g
e-recu
r
sive
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
E
r
ic
Raible
Com
p
letion: add mis
s
i
ng '
=
'
for 'diff --d
i
ff-filter'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Junio C Hamano
tem
p
lates/Makefile: install i
s
unnecessary, just
u
se
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Brand
o
n Casey
r
emote
.
c: add a fu
n
ction
for
deleting a refspec
a
r
ray
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Johannes Sixt
f
ilter-bran
c
h: Grok special
c
haract
e
rs
in t
a
g nam
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Johanne
s
Schindelin
test-lib
:
do not r
e
move t
r
ash_d
i
re
c
tor
y
i
f
called with
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Paolo Bonzin
i
provide mor
e
errors for
t
he
"merge into
e
mpty head
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Shawn O
.
Pearce
Make reflog query '@{121918829
1
}' act
a
s '
@
{2008
.
8
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Neil
R
oberts
c
onfig
.
mak
.
in: P
a
ss on LDF
L
A
G
S from
configure
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Mark
L
evedah
l
gi
t
-submodule
.
sh
-
Remo
v
e trailing
/
f
r
om URL if found
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Miklos
V
ajna
Fix 'g
i
t h
e
l
p help'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
Junio C
H
am
a
no
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-08-21
Brandon
Cas
e
y
com
p
at/snprintf
.
c: handl
e
snprintf's that always r
e
tur
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
Johan Herland
Teach "
g
it d
i
ff -p" HTML
f
unc
n
a
me patterns
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
Kir
i
ll Smelkov
Teach "git diff
-p" Python funcnam
e
p
a
t
t
er
n
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
Eric Wong
git-svn:
fix dco
m
mit to
u
rls
with embedded usernames
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
Junio C Hamano
Merge bra
n
ch 'ml/su
b
module-forea
c
h'
commit
|
commitdiff
|
tree
2008-08-21
Junio C
H
a
mano
Merge branc
h
'pm/log-exit-
c
ode'
commit
|
commitdiff
|
tree
2008-08-21
Junio C
H
ama
n
o
M
erge branch
's
b
/commi
t
-
tree-minilea
k
'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Hamano
M
e
r
g
e branch 'pb/re
f
l
og-d
w
im'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Hamano
Merge branch 'jc/add-stop-
a
t-sy
m
link'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Hamano
Mer
g
e
branch 'kh
/
diff-t
r
ee'
commit
|
commitdiff
|
tree
2008-08-21
Juni
o
C Haman
o
Merge b
r
anch 'mg
/
count-objects'
commit
|
commitdiff
|
tree
2008-08-21
Junio C
Hamano
Merge branc
h
'm
z
/
pu
s
h
-verbos
e
'
commit
|
commitdiff
|
tree
2008-08-21
Junio
C Ham
a
no
Merge branch 'jc
/
ind
e
x
-
extended-flags'
commit
|
commitdiff
|
tree
2008-08-21
Junio
C Haman
o
M
e
rge
b
r
anch 'cc/merge-base-many'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Hamano
Merge branch 'jc/test-deepe
r
'
commit
|
commitdiff
|
tree
2008-08-21
Ju
n
i
o C Hamano
Merge
b
ranch
'
js/p
a
r
a
llel-test'
commit
|
commitdiff
|
tree
2008-08-21
Mar
k
Lev
e
dahl
git-
s
u
bmodule
.
sh -
R
emove
t
railing / from URL if fou
n
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
J
uni
o
C Ha
m
a
no
Fi
x
"git-merge -s
bog
o
" help text
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
Bra
n
don Case
y
r
evision
.
h: make show_
e
arly_outp
u
t an
e
x
t
e
r
n
whic
h
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next