repo.or.cz
/
git
/
spearce.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Add new test case to ensure git-merge prepends the custom merge message
2008-07-07
Miklos
Vajna
Add n
e
w
t
est case
t
o
e
n
s
u
re git
-
m
e
r
g
e
prepends th
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
Mik
l
os Vaj
n
a
A
d
d
new test case to ensure git-mer
g
e reduces octopus
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
Junio
C
Hamano
In
t
r
o
duce reduce_
h
eads()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
Juni
o
C
H
a
mano
Intro
d
uce g
e
t_merge_base
s
_many()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
Mikl
o
s
Vajna
Add new te
s
t to ensure g
i
t-merg
e
handles more than
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Introduce get
_
octopus
_
merge_bases() in commit
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
M
iklos Vajn
a
git-fmt-me
r
ge-msg: mak
e
it us
a
ble fro
m
other built
i
ns
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
M
i
k
l
os Va
j
na
Move
r
ead_
c
ach
e
_unm
e
rged() to read-cache
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajn
a
Add new test
to e
n
sure git-merge
h
andles pull
.
twohea
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
M
i
klos Vajna
Move pars
e
-option
s
's skip_
p
refix() t
o
g
it-co
m
p
at-util
.
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
Mik
l
os Vajna
Move commi
t
_list_count() to commit
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Move split_cm
d
li
n
e(
)
to al
i
as
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-30
Junio C
H
amano
Mer
g
e branch 'maint
'
commit
|
commitdiff
|
tree
2008-06-30
Br
i
an Gern
h
ardt
A
dd test results di
r
ectory to t/
.
gitignore
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-30
J
e
f
f King
doc/rev-parse
:
clarify re
f
log vs -
-
until f
o
r specifying
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-30
Junio C Ha
m
ano
U
pd
a
te draft release n
o
tes for
1
.
6
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-30
j
rnie
d
er@uchicago
.
ed
u
Docum
e
ntation: don't assu
m
e git-s
h
-
se
t
u
p and
g
it-
p
a
rse
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-30
Junio
C Ha
m
ano
t9700: skip
w
hen Test::More
is not available
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-29
Junio C Hamano
Merge br
a
nch
'maint
'
commit
|
commitdiff
|
tree
2008-06-29
Eric Wong
git-svn: don't
s
anitize
remote names in config
Junio C Hamano
wrote in <7vfxr23s6m.fsf@gitster...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-29
Oliv
i
er Marin
s
how_stats():
fix sta
t
s width
c
a
lcu
l
ation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-29
Olivier M
a
rin
Do
c
umentation:
r
emove
{show,whatc
h
anged}
.
difftre
e
c
o
nfig
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-29
Avery Pennarun
gi
t
-svn: avoid filling
u
p t
h
e disk
with temp fi
l
es
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-29
Björn
Steinbrink
g
i
t c
a
t-
f
ile: Fix memory
leak in batch mode
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-28
Joey Hess
fix git co
n
fig
ex
a
mple synta
x
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-28
J
o
c
hen Vos
s
a
v
oid of
f
-
b
y
-o
n
e error in ru
n
_u
p
load_a
r
ch
i
v
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-28
Lea Wieman
n
GIT-VERSI
O
N-GEN: d
o
not fail if a 'HEAD
'
file exists
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-28
Johannes Sc
h
i
n
deli
n
commit-
t
r
ee: lif
t
complet
e
ly arbitrary limi
t
of 16
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-28
Dm
i
t
ry Potapov
shr
i
nk gi
t
-shell by avoidin
g
redundant depend
e
ncies
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-28
C
hristian Couder
help: ch
e
ck early if we ha
v
e a comma
n
d
,
if no
t
t
ry
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-27
Jun
i
o
C Hamano
Document th
e
doubl
e
-
dash "rev -- path"
disam
b
iguator
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-27
T
e
d Percival
Don't use dash c
o
mmands (gi
t
-foo) in tutorial-2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-27
L
e
a Wiemann
tes
t
-lib
.
sh: sho
w
git init output
when in verbose mo
d
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-27
J
un
i
o C Hamano
Merge branch
'maint'
commit
|
commitdiff
|
tree
2008-06-27
Junio C Hamano
Me
r
ge
b
r
anch 'm
a
int-
1
.
5
.
5'
i
nto mai
n
t
commit
|
commitdiff
|
tree
2008-06-27
Junio C Haman
o
GIT 1
.
5
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-27
Juni
o
C Ham
a
n
o
Merge
b
ranch
'maint-1
.
5
.
4' in
t
o
main
t
-1
.
5
.
5
commit
|
commitdiff
|
tree
2008-06-27
Junio
C Hamano
GIT 1
.
5
.
4
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-26
Junio C
Hama
n
o
git-shell: acce
p
t "g
i
t
f
oo" form
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-26
Junio C Hamano
diff --check: do not discard
e
rr
o
r status
u
p
o
n seei
n
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-26
Jeff K
i
ng
impro
v
e for-each-ref
t
est script
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-26
Jing Xu
e
Add 'git
-
p4
.
allowSubmit' to g
i
t-p
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-26
Jun
i
o C
H
am
a
no
Start draft
re
l
e
a
se not
e
s for 1
.
6
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-26
Dmi
t
r
y Pota
p
ov
update-hook-exa
m
ple
:
optionally al
l
ow
n
o
n-
f
ast-fo
r
ward
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-26
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-06-26
Alex Riesen
Fix use of "perl -
i
" on Window
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-26
Ju
n
io C Hamano
GI
T
1
.
5
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
J
u
nio C H
a
mano
Merge branch 'sb/re
b
ase'
commit
|
commitdiff
|
tree
2008-06-25
Ju
n
io C Hamano
Merge
bra
n
c
h 'lw/g
i
tweb'
commit
|
commitdiff
|
tree
2008-06-25
Junio C Hamano
Merge br
a
n
c
h
'lt/config-f
s
y
nc'
commit
|
commitdiff
|
tree
2008-06-25
Junio
C
Hamano
Merg
e
branch 's
r
/t
e
sts'
commit
|
commitdiff
|
tree
2008-06-25
Junio C Haman
o
M
e
rge branch
'
j
h/clone-pack
e
d
-
refs'
commit
|
commitdiff
|
tree
2008-06-25
Junio C Haman
o
Merge
branch 'lw/perlish'
commit
|
commitdiff
|
tree
2008-06-25
D
mitr
y
Potapov
f
i
x update
-
hook
-
example t
o
work with p
a
c
k
e
d
tag references
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
Jeff King
c
l
o
ne: create inte
r
m
e
d
i
a
te directories of de
s
t
ination
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
Junio
C
H
a
m
ano
Merge
b
ranch 'j
c
/maint-co
m
bine-dif
f
-pre-co
n
text'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2008-06-25
Junio
C
Hama
n
o
Merg
e
bra
n
ch
'
l
t
/maint-git
d
ir-rela
t
i
ve'
into maint
commit
|
commitdiff
|
tree
2008-06-25
Junio C Hamano
Merge b
r
anch 'sb/maint-rebase
'
into maint
commit
|
commitdiff
|
tree
2008-06-25
Jeff King
f
or-each-ref: implement missing tag values
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
Ni
c
o
l
a
s
Pit
r
e
ve
r
ify-pac
k
:
test for
detec
t
ion of index v
2
object
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
Ni
c
olas Pitre
verify-p
a
c
k: check packe
d
object CRC wh
e
n using
i
ndex
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
Nico
l
a
s
Pitre
move show_
p
ack_info() where
i
t belongs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
Nicolas Pitre
opti
m
i
z
e v
e
rify-p
a
c
k
a
bi
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
J
eff King
clone: create
interme
d
iate directorie
s
of destination
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
J
unio C Ham
a
no
Sh
i
p sam
p
le hooks wi
t
h
.
sample s
u
f
f
i
x
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
Ju
n
io C Hamano
pre-rebase hoo
k
u
p
date
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
Nicolas Pitre
r
efa
c
t
o
r
p
ack
s
t
ructure allocat
i
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-24
Nico
l
as Pitre
test case
f
o
r pack resilienc
e
against
corrup
t
ions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-24
Nicolas Pitre
implement some r
e
s
i
lience aga
i
n
s
t pack corruptions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-24
Nicola
s
Pitre
c
all
init_p
a
ck_revindex(
)
lazily
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-24
Junio
C
Hama
n
o
Mer
g
e
bran
c
h
'm
a
int'
commit
|
commitdiff
|
tree
2008-06-24
Jan Krüger
git-s
v
n:
m
ake rebu
i
ld re
s
pect rewriteR
o
ot
op
t
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-23
Pa
t
rick Higgins
Workaround fo
r
AIX
m
kstemp()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-23
Mich
e
le Ballabio
t9301-fast-e
x
port
.
sh:
R
emove
d
e
bug lin
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-23
Linus Torvalds
Sh
r
ink the git binary
a bit
b
y
avoidi
n
g
unne
c
e
s
sary
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-23
Junio C Hamano
Merg
e
bra
n
ch 'maint
'
commit
|
commitdiff
|
tree
2008-06-23
Steph
a
n
Beyer
Extend parse-opt
i
o
ns tes
t
suite
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-23
Stephan B
e
yer
ap
i
-pa
r
s
e
-op
t
ion
s
.
txt: I
n
troduce d
o
cumentation for
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-23
Mich
e
le Ballabio
parse
-
options
.
c: fix
d
ocumentation syn
t
ax of optio
n
al
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-23
S
tep
h
an Bey
e
r
a
pi-buil
t
in
.
txt: upda
t
e
and
f
ix typo
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-23
Step
h
an Beyer
git-rebase
.
sh:
A
dd
c
h
e
ck if rebase
i
s in
p
ro
g
res
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-23
St
e
phan Beye
r
t3
4
0
4
: stricter
tests for git-rebase--interactive
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-23
Stephan Be
y
er
api-bui
l
tin
.
tx
t
: updat
e
a
n
d fix
t
ypo
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-22
Junio C H
a
mano
Merg
e
bran
c
h 'rs/archive-ignore'
commit
|
commitdiff
|
tree
2008-06-22
Junio C Hamano
Me
r
g
e
branch '
l
t/racy-empty'
commit
|
commitdiff
|
tree
2008-06-22
Junio C Haman
o
Merge branc
h
'
s
n/s
t
atic'
commit
|
commitdiff
|
tree
2008-06-22
J
unio C Hamano
Merge
b
ranch 'j
c
/maint-comb
i
ne-diff-p
r
e-context'
commit
|
commitdiff
|
tree
2008-06-22
Juni
o
C
H
am
a
no
Merge branch 'lt/mai
n
t-gitdi
r
-relative'
commit
|
commitdiff
|
tree
2008-06-22
J
unio C Hamano
Me
r
ge branch 'jk/
t
est'
commit
|
commitdiff
|
tree
2008-06-22
Junio C H
a
mano
Merge branch 'pb/f
a
st-export'
commit
|
commitdiff
|
tree
2008-06-22
Ju
n
i
o
C Hama
n
o
Merge branch '
m
o
/
s
tatus-unt
r
ac
k
ed'
commit
|
commitdiff
|
tree
2008-06-22
Junio C
H
amano
Merge
b
ranch 'kh/update
-
ref'
commit
|
commitdiff
|
tree
2008-06-22
Junio C Hama
n
o
M
e
rge
b
ranc
h
'jn/web'
commit
|
commitdiff
|
tree
2008-06-22
Junio C Hamano
M
erge bran
c
h 'rg/git
w
eb'
commit
|
commitdiff
|
tree
2008-06-21
Shawn O
.
P
e
a
rce
Correct do
c
umentati
o
n for git
-
pu
s
h --mirror
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-21
Jakub Narebski
t/README: Add 'Skippi
n
g Tests
'
se
c
tion
b
elo
w
'
Run
n
ing
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-21
Cris
t
ian Peraferrer
Print errno upon f
a
ilure to open the COMMIT_EDI
T
MSG
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-21
Teemu Likon
e
n
Add
target "inst
a
ll-html" the the t
o
p lev
e
l Makefile
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-20
Te
e
mu Likonen
b
ash: Add m
o
re option completions
for 'git log'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-20
Lukas S
a
ndström
Add a helper script to send p
a
tc
h
es with Mozi
l
l
a
Thunder
b
ir
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next