repo.or.cz
/
git
/
git-svn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
merge-recursive: move the global obuf to struct merge_options
2008-09-05
Miklos Vajna
merge-r
e
cursive:
m
ov
e
the
g
lobal obuf to struct
m
erge_opt
i
ons
commit
|
commitdiff
|
tree
2008-09-05
Miklos Vajna
merge-recur
s
i
ve: get rid
of the index_on
l
y
g
loba
l
varia
b
le
commit
|
commitdiff
|
tree
2008-09-04
Miklos
Vajna
merge-rec
u
rsive: move call_depth
t
o struct merge_
o
pt
i
ons
commit
|
commitdiff
|
tree
2008-09-03
M
ik
l
os Vaj
n
a
cherr
y
-
p
ick/revert:
m
ake direc
t
internal call t
o
m
er
g
e_
t
r
ee(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-31
Miklos Va
j
n
a
b
u
il
t
in-merge: avoid ru
n
_
co
m
mand_v_opt() fo
r
recursive
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-31
M
i
kl
o
s
Va
j
na
m
erge-recur
s
ive
:
in
t
r
oduce me
r
ge_options
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-31
S
t
ephan Beyer
merge-r
e
cursi
v
e
.
c: Add
more gene
r
ic merg
e
_r
e
cursive
_
g
e
neric()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-31
Miklos
V
ajn
a
S
plit o
u
t mer
g
e_recursive() to m
e
rge-recur
s
ive
.
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-31
Junio C Ham
a
no
Merge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2008-08-31
Junio C Hamano
gitattributes: -crl
f
is not
b
inary
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-30
Junio C Hamano
g
it-apply:
L
oos
e
n "match_beginn
i
ng" logic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-30
Juni
o
C
Ha
m
an
o
Fix examp
l
e in git-name-rev d
o
cumentation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-30
Junio C Hamano
Merge branch 'sp
/
missing-thin-ba
s
e' in
t
o m
a
int
commit
|
commitdiff
|
tree
2008-08-30
Juni
o
C Hamano
Me
r
g
e
branc
h
's
b
/
d
aemon'
commit
|
commitdiff
|
tree
2008-08-30
Juni
o
C
Hama
n
o
Me
r
ge b
r
anch 'af/maint-install-no-handl
i
nk' int
o
m
a
int
commit
|
commitdiff
|
tree
2008-08-30
Junio
C
H
aman
o
s
h
e
l
l
: do not play d
u
plicated defini
t
ion games to shrink
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-30
Alex Riesen
Fix
use
o
f hardlinks in "make ins
t
all"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-30
Ju
n
io C Hamano
Mer
g
e branch 'np/ve
r
ify-pack
'
into maint
commit
|
commitdiff
|
tree
2008-08-29
J
unio C H
a
mano
Mer
g
e branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2008-08-29
To
r
Arvid Lund
git-p4: Fix
c
hecko
u
t bug
w
hen using
--import-lo
c
al
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-29
Pa
o
lo C
i
arrocchi
tutorial: gentler illus
t
ration of A
l
ice/Bo
b
work
f
low
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-29
Jeff Kin
g
pr
e
t
ty=format: res
p
ect
date fo
r
mat options
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-29
Paolo Bonzini
ma
k
e git
-
sh
e
ll pa
r
an
o
id
a
bout
c
losed stdin/
s
tdout/
s
tder
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-29
Y
a
nn Dirson
D
ocument gitk --arg
s
cmd flag
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-29
Linus To
r
valds
Fix
'
-
-
d
irstat' with cross-directory renaming
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-29
Björ
n
Steinbrink
fo
r
-each-ref:
A
l
low a trailing slash
in the patterns
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-29
Alex Riesen
l
i
s
t
_comma
n
ds: only call git_e
x
ec_path if i
t
is needed
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-29
Al
e
x Riesen
Allow git
h
e
lp work without PATH set
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-29
Alex Ri
e
sen
Make main_
c
mds and ot
h
er_cmds local
to
b
uiltin-help
.
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-29
Alex
R
i
es
e
n
Remove useles
s
memset of stat
i
c
com
m
and name l
i
sts
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-29
Al
e
x
R
i
e
sen
Remo
v
e calcu
l
a
tion o
f
the lon
g
es
t
c
o
m
mand name
f
r
o
m
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-29
Br
a
ndo
n
Casey
dir
.
c: Avoid c99 array initialization
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-29
Mat
t
hias Kestenholz
b
a
sh-completion: Add
a
ll subm
o
dule su
b
c
o
mmands
to the
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-28
Junio C
Hamano
Merge
b
ranch 'mv/me
r
ge-custom'
commit
|
commitdiff
|
tree
2008-08-28
Junio
C
Hamano
Merge branch 'ml
/
su
b
mod
u
l
e
'
commit
|
commitdiff
|
tree
2008-08-27
Junio C Hamano
M
erge branch
'am/cherry-
p
ick-rerer
e
'
commit
|
commitdiff
|
tree
2008-08-27
Ju
n
io C Hamano
Merge
branch 'jc/a
d
d-addremove'
commit
|
commitdiff
|
tree
2008-08-27
Junio C Ha
m
a
no
M
e
rge b
r
anch 'np/
v
erify-
p
ack'
commit
|
commitdiff
|
tree
2008-08-27
J
unio C Hamano
Merg
e
bran
c
h 'da/submod
u
le-sync'
commit
|
commitdiff
|
tree
2008-08-27
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-08-27
J
unio C Ha
m
ano
c
type
.
c:
protect tiny
C
p
repro
c
e
ssor
c
o
n
stants
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-27
Linus Torvald
s
index-pack
:
be
c
a
reful aft
e
r fixin
g
up the
h
eader/footer
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-27
S
i
mo
n
Haus
m
an
n
Make it possi
b
le to abort the submission of a change
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-27
Junio C Ha
m
ano
M
e
rge branch 'af/maint-install-
n
o-handlink'
commit
|
commitdiff
|
tree
2008-08-27
Junio C H
a
mano
Merge
branch
'jc/n
o
-slim-shell'
commit
|
commitdiff
|
tree
2008-08-27
Junio C
H
amano
Me
r
ge branc
h
'ma
i
nt'
commit
|
commitdiff
|
tree
2008-08-27
Jeff King
form
a
t-patc
h
:
use default diff f
o
rmat
e
ven wi
t
h patc
h
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-26
Nguyễn Thái Ngọc
Duy
index-pack: s
e
tu
p
g
it
re
p
ository
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-26
R
amsay Jones
Sup
p
ress some bash re
d
ir
e
c
t
ion error messages
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-26
Ramsay Jone
s
F
i
x a warning (on cy
g
win
)
t
o allow -W
e
rror
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-26
Andreas Färber
Makefi
l
e:
a
lw
a
ys p
r
ovide a fallback when hardlinks
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-26
Juni
o
C Hama
n
o
daemo
n
.
c: minor sty
l
e f
i
xup
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>:
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-26
D
a
v
id
Agu
i
lar
git-s
u
bmodule: add "sync" command
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-26
Ju
n
io C H
a
mano
Reve
r
t "Build-in "git-shell""
commit
|
commitdiff
|
tree
2008-08-25
J
eff King
Fix "git
l
og -i --grep"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-24
Tommi Virtanen
Install git-sh
e
ll in
bindir, too
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-24
Ju
n
io C Haman
o
Merge
branc
h
'
jc/no-sl
i
m
-
shell'
commit
|
commitdiff
|
tree
2008-08-24
J
uni
o
C Ha
m
ano
Merge branch
'
maint
'
to sync with
1
.
6
.
0
.
1
commit
|
commitdiff
|
tree
2008-08-24
Jun
i
o C
Hamano
GIT 1
.
6
.
0
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-24
Junio
C
Hamano
Mer
g
e branch
'ag/maint-combine-
d
iff
-
fi
x
'
i
n
t
o
maint
commit
|
commitdiff
|
tree
2008-08-24
Junio C Hamano
Merge
b
ra
n
c
h
'
m
v/maint-
m
erge-fix' into mai
n
t
commit
|
commitdiff
|
tree
2008-08-24
Ma
r
k Levedahl
gi
t
-submodule - Use "get_defau
l
t
_
remote" from git
-
parse
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-24
Jona
t
ha
n
N
ieder
Do
c
umentation: clarify pager configurat
i
on
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-24
J
o
n
athan Ni
e
der
Docum
e
ntation: clari
f
y pager
.
<cmd> configurati
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-24
Simon Hau
s
mann
C
lean up t
h
e g
i
t-p4 documentation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-24
Alexan
d
e
r Gav
r
ilov
R
es
p
e
ct
c
ore
.
aut
o
crl
f
i
n
c
o
mbined
d
iff
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-24
M
i
klos Vajna
Makef
i
le: en
a
ble SN
P
RINTF_RETU
R
N
S_BOGUS
f
o
r
HP-UX
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-24
J
u
nio C
H
am
a
no
t760
6
: fix custom merge
t
est
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-24
Junio
C
Hamano
Me
r
ge branch 'maint'
commit
|
commitdiff
|
tree
2008-08-24
Junio C Hamano
merge: f
i
x numerus b
u
gs around
"
tri
v
ial merge" area
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-24
J
unio C Hamano
unpack_trees(
)
: protec
t
the handcrafte
d
in
-
core i
n
dex
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-23
T
o
r Arvid Lund
git-p4: Fix
o
ne-liner in p4_write_pipe fun
c
tion
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-23
D
a
vid
Agu
i
lar
g
i
t-
s
ubmo
d
u
le: replace dup
l
i
cated code with a mod
u
le_list
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-23
Nico
l
as Pi
t
re
disca
r
d
revindex da
t
a
w
h
en
pack
list changes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-23
Dan
Hensgen
git-merge documentation: more d
e
tails about resolving
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-23
Alex Riesen
Extend "checkout --track" DWIM to
s
upport mor
e
cases
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-22
J
onath
a
n d
e
l Strother
Revert "Conve
r
t output m
e
ssa
g
es in
m
erge-
r
ecursive
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-22
Eric Raible
Completio
n
: add mi
s
sing
'='
for 'di
f
f
-
-
d
iff-filter'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-22
Junio C Ham
a
no
te
m
plates/
M
a
ke
f
ile: install is u
n
necessa
r
y, j
u
st use
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-22
Brandon Casey
remote
.
c
:
add a
functi
o
n
f
o
r
dele
t
ing a refspec array
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-22
Johan
n
es Sixt
filte
r
-br
a
nch:
Grok spec
i
al
c
h
a
racters in tag
n
a
mes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-22
Johannes Sch
i
ndelin
test
-
lib: do not remove trash_dire
c
tory if called
w
i
th
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-22
Paolo B
o
nzini
provide more
errors
for
t
h
e
"merge i
n
to empt
y
head
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-22
Shawn O
.
Pearce
Ma
k
e
r
eflog quer
y
'@{1219188
2
9
1
}' act as '@{2
0
08
.
8
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-22
Neil R
o
be
r
ts
config
.
ma
k
.
i
n
: Pa
s
s
on LDFLAGS from configure
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-22
Mark L
e
ved
a
hl
g
i
t-submodule
.
sh - Remove trailing
/ from UR
L
if found
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-22
Miklos Vajna
Fix 'g
i
t
h
elp h
e
lp'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-21
Junio C
Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-08-21
Bran
d
on
C
asey
compat/snpr
i
ntf
.
c:
handle
snpr
i
n
t
f's th
a
t always return
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-21
J
ohan
H
e
rland
Te
a
ch "
g
it diff
-
p"
H
TML func
n
ame patt
e
r
n
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-21
Kirill S
m
elko
v
Teac
h
"git d
i
f
f
-p" P
y
t
hon func
n
ame patterns
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-21
Er
i
c Wong
g
it-svn: fix dcom
m
it t
o
urls with embedded usernames
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-21
Junio
C Ham
a
no
Merge branch 'ml/submod
u
le-fore
a
c
h'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Hamano
Mer
g
e branch 'pm/log-exit
-
code'
commit
|
commitdiff
|
tree
2008-08-21
Ju
n
io C
H
amano
Merge branch 'sb/
c
ommit-tree-minileak'
commit
|
commitdiff
|
tree
2008-08-21
Junio
C
H
a
mano
Merge b
r
anch 'pb/reflog-dwim'
commit
|
commitdiff
|
tree
2008-08-21
Junio C
Hamano
Merge branch 'jc/ad
d
-sto
p
-
a
t-s
y
mlink'
commit
|
commitdiff
|
tree
2008-08-21
J
u
n
i
o C Ham
a
n
o
Merge bra
n
ch 'kh/diff-tre
e
'
commit
|
commitdiff
|
tree
2008-08-21
Juni
o
C Ha
m
ano
Mer
g
e
branch 'mg
/
count-
o
bjects'
commit
|
commitdiff
|
tree
2008-08-21
Junio C
H
a
man
o
Merge
b
r
a
nch
'mz/push-verbose'
commit
|
commitdiff
|
tree
next