repo.or.cz
/
git
/
vmiklos.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
new
test cas
e
t
o
ensur
e
git-merge pre
p
e
n
ds t
h
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
Mikl
o
s Vajna
Add n
e
w test
c
ase t
o
e
n
s
ure git-merge
r
edu
c
es
o
ct
o
pus
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
Junio
C Hamano
Intr
o
duce reduce_he
a
ds()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
Junio C H
a
mano
Introduce get_me
r
ge_bases
_
m
any()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajn
a
Add new tes
t
t
o
e
n
s
ure git-merge hand
l
e
s
mor
e
than
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Introduce
g
e
t
_octopus_mer
g
e_bases() in
commit
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
Mi
k
los Vajna
git-
f
mt-merge-
m
sg: make it
u
s
a
b
le
f
rom other built
i
n
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Move re
a
d_cache_unmerged() to
read-cache
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vaj
n
a
Add new test to ensure
gi
t
-mer
g
e handles pull
.
twohead
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
Miklos
Vajna
Move p
a
rse
-
options's skip
_
prefix() to
g
it-co
m
pat-util
.
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
Mik
l
os Vaj
n
a
Move c
o
mmi
t
_li
s
t
_
count()
t
o c
o
mmit
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Move split_cmdline(
)
to
alias
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-30
Junio C Hamano
Merge bra
n
ch '
m
ain
t
'
commit
|
commitdiff
|
tree
2008-06-30
Brian G
e
rnha
r
dt
A
d
d
t
e
st r
e
sults
dire
c
tory to t/
.
gi
t
i
gnore
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-30
Jeff King
doc/rev-parse:
c
l
arify r
e
f
log vs --unt
i
l f
o
r specifying
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-30
Jun
i
o C Hamano
Update
draf
t
re
l
ease
notes fo
r
1
.
6
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-30
jrnieder@uchica
g
o
.
edu
Document
a
tion: don't assum
e
git-
s
h
-
s
e
t
up
a
nd git-parse
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-30
J
unio
C Hamano
t9
7
00
:
s
k
ip when Test::More is not
a
vailable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-29
Junio
C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-06-29
E
r
i
c Wong
gi
t
-
s
v
n
: d
o
n't sanitize
remote n
a
mes 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
Ol
i
vier Mari
n
sho
w
_s
t
a
t
s(): fix stats wi
d
th calculat
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-29
Oli
v
ier Marin
D
ocumentation: remov
e
{s
h
ow,whatchanged
}
.
dif
f
tree c
o
n
f
ig
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-29
Avery
Penn
a
run
git-sv
n
: av
o
id filling up
t
he
disk w
i
th temp
files
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-29
Bj
ö
rn Stei
n
brink
git ca
t
-fil
e
:
F
i
x
memory leak
in batch mode
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-28
Joey Hess
fix git config example s
y
ntax
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-28
Jochen Voss
avoid off-by-
o
ne err
o
r in run_
u
pload_ar
c
hive
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-28
Lea Wiemann
GIT
-
VE
R
SIO
N
-GEN
:
do not fail if a 'HEAD
'
file ex
i
sts
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-28
Johan
n
e
s Sch
i
n
delin
commit-tree: lift compl
e
tely arbitrary limit of 16
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-28
Dmitr
y
Potapo
v
s
h
r
i
n
k git-shell
by avoiding redunda
n
t
depende
n
cies
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-28
C
hris
t
ian Co
u
d
er
h
elp: ch
e
c
k
e
a
r
l
y i
f
we have a command
,
if not try
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-27
Junio
C H
a
mano
Docum
e
nt the double-dash "rev -- path" d
i
sambigu
a
tor
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-27
Ted Percival
Don'
t
u
s
e dash commands (
g
it-foo) in
t
utorial-2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-27
L
e
a
Wiemann
tes
t
-
lib
.
sh: sh
o
w
git i
n
it ou
t
put
when in verb
o
se m
o
de
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-27
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-06-27
Junio
C
H
amano
Merge branch 'maint-1
.
5
.
5'
int
o
m
a
int
commit
|
commitdiff
|
tree
2008-06-27
J
un
i
o C Hama
n
o
GIT 1
.
5
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-27
Junio C Hamano
Merge bra
n
ch 'm
a
int-1
.
5
.
4' into
maint-1
.
5
.
5
commit
|
commitdiff
|
tree
2008-06-27
J
u
n
io C Hamano
GIT 1
.
5
.
4
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-26
Junio C Hamano
git-shell: accept "git
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
di
s
card error sta
t
u
s upon seei
n
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-26
Jeff Kin
g
improve for-each-ref tes
t
scrip
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-26
Jing Xue
Add
'
git
-
p4
.
al
l
owSu
b
mit' to
g
it-p
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-26
Junio C Ham
a
no
Start dra
f
t re
l
ease notes
for 1
.
6
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-26
Dmitry Potapov
upd
a
te-hook-ex
a
mple: optional
l
y allow non-fast-forw
a
rd
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-26
Ju
n
io C
Hama
n
o
Merge branch
'
maint'
commit
|
commitdiff
|
tree
2008-06-26
A
lex Riesen
F
ix use of "perl
-
i
" on W
i
ndows
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-26
Junio C Hamano
GIT
1
.
5
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
Junio C Hamano
Merg
e
bra
n
c
h 'sb/re
b
a
se'
commit
|
commitdiff
|
tree
2008-06-25
Ju
n
i
o
C
Hama
n
o
Merge br
a
nch 'lw/gitweb'
commit
|
commitdiff
|
tree
2008-06-25
J
unio C Hamano
M
erge branch
'
lt/config-fsync'
commit
|
commitdiff
|
tree
2008-06-25
J
u
nio C Hamano
Merge br
a
nch 'sr/tests'
commit
|
commitdiff
|
tree
2008-06-25
Jun
i
o
C
Hamano
Merge branch 'jh/clo
n
e
-pa
c
ked-re
f
s
'
commit
|
commitdiff
|
tree
2008-06-25
Junio C
Ham
a
no
Me
r
ge
b
r
anch 'lw/pe
r
l
ish'
commit
|
commitdiff
|
tree
2008-06-25
Dmitry Pota
p
o
v
fi
x
upd
a
te-hook-
e
xamp
l
e to work
with packed tag referen
c
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
Jeff King
clone:
c
reate interm
e
diate directories of
d
e
stination
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
Junio C
Hama
n
o
Merge bra
n
ch 'jc/main
t
-
combi
n
e-diff-pre-co
n
text' into
.
.
.
commit
|
commitdiff
|
tree
2008-06-25
Juni
o
C H
a
m
a
n
o
M
e
rge b
r
anch 'lt/maint-gitd
i
r-relative' into maint
commit
|
commitdiff
|
tree
2008-06-25
Ju
n
io C Hama
n
o
Merge bran
c
h 'sb/mai
n
t-
r
ebase' into mai
n
t
commit
|
commitdiff
|
tree
2008-06-25
J
e
f
f
King
for-each-ref: implem
e
nt missing tag values
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
Nicolas Pitre
verify-
p
ack: test
f
or
d
et
e
c
t
i
on o
f
inde
x
v2 object
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
Ni
c
o
l
as
P
itre
ver
i
fy-pack:
c
h
e
c
k packed object CRC w
h
e
n
using in
d
ex
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
Ni
c
olas Pitre
move show_
p
ack_info() where it belongs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
Nic
o
las Pitre
optimize
v
erify-pack a bit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
Jeff Ki
n
g
cl
o
ne:
c
reate in
t
ermed
i
ate dire
c
to
r
ies of destinati
o
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
Junio C Ham
a
no
Ship sampl
e
hooks with
.
sam
p
le suffix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
J
unio C
Hamano
p
r
e-rebase
hook update
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-25
Nicolas Pitre
r
e
f
actor pack struc
t
ure allocation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-24
Nicolas
Pitre
test ca
s
e for pa
c
k resilience against corruptions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-24
Nicolas Pit
r
e
i
m
plem
e
nt
some r
e
silie
n
ce against pac
k
c
orruptions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-24
Nicolas
P
i
tre
c
a
ll init_pa
c
k_revindex()
l
azily
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-24
Junio C
H
amano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-06-24
Jan Krüge
r
git-svn:
m
a
k
e
r
ebuild r
e
spect rewriteRoo
t
option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-23
P
a
t
rick Higgins
Wo
r
k
a
round f
o
r AIX mkste
m
p()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-23
Michele Balla
b
io
t9301-fast-exp
o
rt
.
sh
:
Re
m
ove debug l
i
ne
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-23
Linus Tor
v
alds
Sh
r
ink th
e
git binary a bi
t
by avoid
i
ng unneces
s
ary
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-23
J
unio C Ham
a
no
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-06-23
Stephan Beye
r
E
x
ten
d
pars
e
-
options test su
i
te
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-23
Stepha
n
Beyer
api
-
p
a
rse-op
t
i
ons
.
txt: Introdu
c
e document
a
t
ion for
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-23
M
ichele Ballabio
parse-options
.
c: fi
x
docume
n
tat
i
on s
y
n
tax of optional
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-23
Step
h
an Beyer
api-builtin
.
txt: update and fix t
y
po
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-23
Stephan Beyer
git-re
b
ase
.
sh:
A
dd che
c
k if reb
a
se is in p
r
og
r
ess
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-23
Stephan Beyer
t
3
404:
s
tr
i
cte
r
tests for
g
it
-
rebase--interactive
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-23
Stephan
B
eyer
api-built
i
n
.
txt: update
a
n
d
fi
x
typ
o
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-22
Junio C H
a
m
ano
M
erge
b
ranch 'rs/a
r
c
h
ive-ignore'
commit
|
commitdiff
|
tree
2008-06-22
Junio C Ham
a
n
o
Merge branch 'lt/ra
c
y
-empty'
commit
|
commitdiff
|
tree
2008-06-22
Junio C Hamano
Merge branch 'sn/st
a
t
ic'
commit
|
commitdiff
|
tree
2008-06-22
Junio C Hamano
Merge branch '
j
c/
m
aint
-
combine-diff-pre-cont
e
x
t
'
commit
|
commitdiff
|
tree
2008-06-22
Ju
n
io C
H
a
m
ano
Merge branch 'lt/maint-gitdir-relative'
commit
|
commitdiff
|
tree
2008-06-22
J
u
nio C
Hamano
Me
r
ge br
a
nch 'jk/test'
commit
|
commitdiff
|
tree
2008-06-22
Junio C Hamano
M
erge branc
h
'pb/fast-e
x
port
'
commit
|
commitdiff
|
tree
2008-06-22
Junio
C
Hama
n
o
M
e
rge branch 'mo/sta
t
us-
u
ntr
a
cke
d
'
commit
|
commitdiff
|
tree
2008-06-22
Junio C Hamano
Merge bran
c
h 'kh/updat
e
-ref'
commit
|
commitdiff
|
tree
2008-06-22
Junio C Hamano
Merg
e
bra
n
ch 'jn/web'
commit
|
commitdiff
|
tree
2008-06-22
Junio C Hamano
M
e
rg
e
branch 'rg/gitweb'
commit
|
commitdiff
|
tree
2008-06-21
Shawn
O
.
Pe
a
r
c
e
C
o
rrect do
c
u
m
entation for g
i
t-push --mirror
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-21
Jak
u
b Narebski
t
/README: A
d
d 'S
k
ipping T
e
s
t
s' sec
t
ion below 'Runn
i
ng
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-21
C
r
i
stian Peraferrer
Print er
r
no upon failure to
o
pen the
C
O
MMIT_EDITMSG
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-21
Teemu Li
k
onen
A
dd target "install-html" the
the
t
o
p
l
evel Makefile
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-20
Teemu Likone
n
bash: Add more option com
p
let
i
ons for 'git l
o
g
'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-06-20
Lukas Sands
t
röm
Ad
d
a hel
p
er scrip
t
to se
n
d patches
w
ith
Mozilla
Thunderb
i
rd
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next