repo.or.cz
/
git
/
jnareb-git.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 reduces octopus parents when possible
2008-07-01
Mi
k
los V
a
j
na
A
dd ne
w
test case to ensu
r
e git-m
e
rge reduces oct
o
pus
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-01
Ju
n
i
o
C Hama
n
o
I
ntrodu
c
e re
d
uce_heads()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-01
Junio C
H
a
mano
I
n
troduce g
e
t_m
e
rge_bases_
m
a
n
y()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
A
dd new test to ensure
g
it-mer
g
e han
d
le
s
more than
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-01
Mikl
o
s V
a
jna
In
t
roduce get
_
octopus_mer
g
e_bas
e
s
() in
commit
.
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
git
-
f
mt-merge-msg: make it
usable from
o
ther bu
i
ltin
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-01
Mi
k
los V
a
jna
Move read_cach
e
_unmerged(
)
to read-cache
.
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Add
new t
e
st to ensure git-m
e
rge handles
pull
.
t
wohead
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-01
Mik
l
os Vajna
Move p
a
rse-option
s
's skip_prefix()
to git-compat-ut
i
l
.
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-01
Miklo
s
Vajna
Move commit_li
s
t_count() to co
m
mit
.
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos V
a
jna
Move split_cmd
l
ine() to alias
.
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-30
Ju
n
io
C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-06-30
Brian Gern
h
ardt
Add test
results
d
irectory to
t
/
.
gitignore
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-30
Je
f
f King
do
c
/rev-
p
ar
s
e
:
clarify re
f
log
v
s --
u
nti
l
for sp
e
cifying
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-30
Juni
o
C Haman
o
U
pda
t
e
draft re
l
ease notes f
o
r
1
.
6
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-30
jrnieder@uchicago
.
edu
Documentation: don
'
t a
s
su
m
e
git-sh-setup and git-pa
r
se
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-30
Junio C Hamano
t
9700: skip w
h
en Test::M
o
re is not available
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-29
J
unio C Haman
o
Merge branch '
m
ai
n
t'
commit
|
commitdiff
|
tree
2008-06-29
Eric
Wong
git-svn: don't
sanitize remote
name
s
i
n
confi
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-29
Olivie
r
Mari
n
show_stats
(
): fix stats wi
d
th cal
c
ula
t
ion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-29
Olivier
M
arin
Documen
t
atio
n
:
remove
{sh
o
w
,w
h
atchanged}
.
d
i
fftree config
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-29
Aver
y
P
e
nnarun
git-s
v
n: avoi
d
filli
n
g
up the disk with
temp f
i
les
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-29
Björn Steinb
r
i
n
k
git cat-f
i
le:
Fix memory leak in batch mo
d
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-28
Joey He
s
s
fix git config example syntax
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-28
Jochen Voss
a
v
oid
off-by-
o
ne err
o
r
i
n
r
un_upl
o
ad_archiv
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-28
Lea
W
i
e
mann
GIT-VERSION-GEN: do n
o
t
f
ai
l
if a 'HEAD'
f
ile ex
i
sts
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-28
J
o
h
annes Sc
h
ind
e
lin
commit-
t
ree:
l
ift completely arbitrary limit o
f
16
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-28
Dmitry Potapov
shr
i
nk
git-shell
b
y avoiding redunda
n
t
d
e
p
endencie
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-28
C
h
ristian
Couder
h
e
lp: check early if
we
h
a
v
e a c
o
mmand, if
n
ot try
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-27
Junio C Hama
n
o
Document the dou
b
le
-
dash "rev --
pa
t
h
"
disambiguator
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-27
Te
d
Percival
Don't us
e
dash comman
d
s (git-
f
oo) in
tuto
r
ia
l
-2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-27
Lea Wiemann
test-lib
.
sh: sho
w
g
i
t
i
nit output when
in verbos
e
mode
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-27
Junio C
Hamano
Me
r
ge bran
c
h 'mai
n
t'
commit
|
commitdiff
|
tree
2008-06-27
J
u
n
i
o C Hama
n
o
Merge branch 'm
a
i
nt-1
.
5
.
5' into maint
commit
|
commitdiff
|
tree
2008-06-27
Ju
n
io C H
a
mano
GIT 1
.
5
.
5
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-27
Junio
C Hama
n
o
Merge br
a
nch 'maint-1
.
5
.
4' into maint-1
.
5
.
5
commit
|
commitdiff
|
tree
2008-06-27
Ju
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 foo" form
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-26
Junio C Ham
a
no
di
f
f --check: do
n
ot discard e
r
ror s
t
a
t
us upon seei
n
g
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-26
Je
f
f
K
i
n
g
improve for
-
each-ref test script
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-26
Jing Xu
e
Add 'git
-
p4
.
all
o
wSubmit'
to git-p4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-26
Junio C Hamano
Start draft release notes f
o
r 1
.
6
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-26
Dmitry Potapov
upda
t
e-hook-e
x
a
mple: op
t
ionally allow
non-fast-f
o
rward
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-26
Junio C Hamano
Me
r
g
e
b
r
anc
h
'maint
'
commit
|
commitdiff
|
tree
2008-06-26
A
l
e
x Rie
s
en
F
ix use of "perl -i" o
n
Windows
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-26
Junio C Hamano
G
IT 1
.
5
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-25
Junio C H
a
mano
M
e
rge
b
ran
c
h '
s
b/re
b
a
s
e'
commit
|
commitdiff
|
tree
2008-06-25
Junio C Hamano
Merg
e
branch 'lw/gitweb'
commit
|
commitdiff
|
tree
2008-06-25
J
unio
C
Ham
a
no
Merge branch 'lt/
c
onfig-fsync'
commit
|
commitdiff
|
tree
2008-06-25
Juni
o
C Hamano
Merge bra
n
ch 'sr/tests'
commit
|
commitdiff
|
tree
2008-06-25
Junio C Hamano
Merge branch 'jh/c
l
one-
p
ac
k
ed-ref
s
'
commit
|
commitdiff
|
tree
2008-06-25
J
u
nio
C Hamano
Me
r
ge br
a
nch 'lw
/
per
l
ish'
commit
|
commitdiff
|
tree
2008-06-25
D
mitry Potapov
fix u
p
d
ate-ho
o
k-
e
xampl
e
to work with pac
k
ed tag refere
n
ces
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-25
Je
f
f
King
clone: create int
e
rmediat
e
directories
of destinat
i
on
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-25
Ju
n
i
o
C Haman
o
M
erge branch 'jc/mai
n
t-com
b
ine-dif
f
-pre-co
n
te
x
t' into
.
.
.
commit
|
commitdiff
|
tree
2008-06-25
J
u
nio
C Hamano
Merge bran
c
h
'lt/maint-gitdir
-
relative' int
o
maint
commit
|
commitdiff
|
tree
2008-06-25
Junio C Ha
m
ano
Merge br
a
nch 'sb/maint-rebase' into maint
commit
|
commitdiff
|
tree
2008-06-25
Je
f
f
K
ing
f
o
r-ea
c
h-ref: i
m
plement missin
g
tag va
l
ues
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-25
Nicolas
Pit
r
e
v
erify-pa
c
k
:
test for detection
o
f index v2 obje
c
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-25
Nicolas
Pitre
verify-pack: check packed object CR
C
when using
index
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-25
Nicolas Pitre
move
s
h
ow_pack_info() where it belong
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-25
Nicolas
P
i
t
r
e
optimize verif
y
-
p
a
c
k a bit
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-25
Jeff Kin
g
clone: create intermediate director
i
es
of d
e
st
i
nation
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-25
Junio C Hamano
S
hip s
a
m
p
l
e
hooks with
.
s
a
m
p
le suf
f
ix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-25
Junio C Hamano
p
re-rebase hook update
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-25
Ni
c
olas Pitre
re
f
ac
t
o
r
pack structure a
l
location
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-24
Nicolas Pitre
tes
t
c
a
se
f
or pack re
s
ilience again
s
t corr
u
p
t
ion
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-24
Nicolas P
i
tre
implement some r
e
s
ilience
aga
i
nst pack corruptions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-24
Nicolas
P
itre
cal
l
init
_
pack_re
v
i
n
dex()
lazil
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-24
Junio
C
Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-06-24
J
an Krüger
git-s
v
n: m
a
k
e
rebuild re
s
p
ect rewr
i
teR
o
ot option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-23
P
a
t
rick Hig
g
ins
Workaround for AIX m
k
s
t
e
m
p()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-23
Michele Ballabio
t9301-fast-ex
p
o
rt
.
s
h
: Remove debug
l
ine
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-23
Linus Torvalds
Shrink the git binary a bit by avoiding
u
nnecessar
y
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-23
Ju
n
io C H
a
man
o
Merge branch
'mai
n
t'
commit
|
commitdiff
|
tree
2008-06-23
Stephan Beyer
Extend pars
e
-
options test s
u
i
t
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-23
S
t
ephan
B
eyer
ap
i
-
parse-o
p
tions
.
tx
t
: Introduce do
c
umentation for
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-23
Michele Ballabio
parse-options
.
c
:
fix do
c
umentation syn
t
ax of optional
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-23
Step
h
an Be
y
er
api-builtin
.
t
xt: up
d
ate and fix
typo
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-23
Stephan Beyer
git-rebase
.
sh
:
Add check
i
f rebase is in progress
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-23
Stephan Beyer
t3404: stri
c
ter te
s
ts for
g
it-rebase--
i
nter
a
ctiv
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-23
Stephan Be
y
er
api-builtin
.
t
xt: update
and f
i
x
typo
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-22
Ju
n
io C Hamano
Merge branch 'rs/arch
i
v
e
-ignore'
commit
|
commitdiff
|
tree
2008-06-22
Junio C Hama
n
o
Merge branch
'
lt/racy-empty'
commit
|
commitdiff
|
tree
2008-06-22
J
unio C Hamano
Merge
br
a
n
c
h 'sn/static'
commit
|
commitdiff
|
tree
2008-06-22
Junio
C Ham
a
no
Merge bran
c
h 'jc
/
m
aint-combine-diff-p
r
e-cont
e
xt'
commit
|
commitdiff
|
tree
2008-06-22
Juni
o
C Hamano
Merge bra
n
ch '
l
t/
m
ain
t
-git
d
ir-rela
t
ive'
commit
|
commitdiff
|
tree
2008-06-22
J
u
nio C
H
amano
Merge branch
'jk/test'
commit
|
commitdiff
|
tree
2008-06-22
Ju
n
io C Ha
m
ano
Merge branch 'p
b
/fast-export'
commit
|
commitdiff
|
tree
2008-06-22
Junio C Hama
n
o
Merge bran
c
h 'mo/st
a
tus-untracked'
commit
|
commitdiff
|
tree
2008-06-22
J
u
nio C Hamano
M
erge branch 'kh/update-ref'
commit
|
commitdiff
|
tree
2008-06-22
Junio C Hamano
Merge branch 'jn/web'
commit
|
commitdiff
|
tree
2008-06-22
Junio C H
a
m
a
no
Merge branch 'rg
/
gitweb'
commit
|
commitdiff
|
tree
2008-06-21
Shawn
O
.
Pearce
Co
r
rect do
c
umentation for gi
t
-push --mirror
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-21
Jakub Narebs
k
i
t/R
E
ADME: A
d
d
'
S
k
ipping Te
s
ts' sec
t
ion below 'Running
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-21
Cristian Peraferre
r
Print
e
rrno upon fai
l
u
r
e to open
the COMM
I
T_EDITMSG
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-21
T
eem
u
Likonen
Add target "inst
a
ll-ht
m
l"
th
e
the top level Makefil
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-20
T
eemu L
i
konen
ba
s
h
:
Add more op
t
ion completions
for 'git log'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-20
Lukas Sandström
Add a
helper
s
cript to send
p
atches with Mozi
l
l
a Thunderbird
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-06-20
Lea Wiemann
gi
t
web
:
stand
a
ri
z
e HTTP status codes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next