repo.or.cz
/
alt-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
merge script: handle many-way octopus
2010-08-18
J
onat
h
an Nieder
merge scri
p
t: handl
e
many-way octopus
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
J
onathan
N
ieder
merge sc
r
i
p
t: handle -m --log correc
t
ly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
J
o
nathan Nieder
merge
sc
r
i
pt: forbid merge
-
s index
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
J
o
na
t
h
an Niede
r
merge scri
p
t: allow custom strategie
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan
Nieder
merge sc
r
ipt: merge -X<option>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
J
o
nathan Nieder
m
e
rge script: improve log mess
a
g
e
subject
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
mer
g
e script: refuse
to
me
r
g
e
dur
i
ng merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
merge
script: tweak u
n
merged fi
l
es message to
match
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jo
n
a
than
Ni
e
de
r
m
e
r
g
e
scr
i
pt: --squash, --ff from unborn
b
ra
n
ch are
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
J
onathan
Niede
r
f
m
t
-merge-ms
g
-
m
to
o
ve
r
ride merge titl
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonatha
n
Nieder
merge-base
-
-
i
nde
p
e
nd
e
nt to print reduc
e
d
p
arent list
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jona
t
h
a
n N
i
eder
m
erge-base --oct
o
pus to mimi
c
sh
o
w-branc
h
-
-merge-base
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
Documentation: add a SE
E
AL
S
O section
f
or merge-ba
s
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonatha
n
Nied
e
r
t6200 (fmt-merge-
m
sg):
s
tyl
e
nitpick
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jo
n
ath
a
n Ni
e
d
e
r
t6010 (merge-base): mod
e
rniz
e
s
t
yle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jona
t
han Niede
r
t7600 (merge
)
: te
s
t
merge fr
o
m
branch
y
et to be born
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonat
h
an Nieder
t7600 (me
r
ge): ch
e
ck r
e
flo
g
entry
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jona
t
han
Nie
d
er
t
7600 (me
r
ge): do
n
o
t
laun
c
h gitk for --d
e
bug
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nie
d
er
t7600 (merge): moder
n
ize style
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jon
a
than Nieder
merge: do not mist
a
ke (ancestor of) tag for bra
n
ch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-21
Junio
C
H
a
mano
Gi
t
1
.
7
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-21
Junio C Ham
a
n
o
tests: correct "does reflog exist?" tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-21
B
randon Casey
t
/
: w
o
rk aro
u
nd one-sho
t
variable assignment wi
t
h test_must_fail
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-21
Jonathan
N
ieder
t/README: c
o
rre
c
t
an exception
w
h
en
b
reaking a && chain
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-20
Brandon Ca
s
ey
t/{t5541,l
i
b
-
h
t
tpd}
:
replace problematic '!()' no
t
at
i
on
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-20
Brand
o
n Casey
t
/t3700: conv
e
rt t
w
o uses o
f
negat
i
on operator '!'
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-20
Junio C Hamano
Merge bra
n
c
h 'main
t
'
commit
|
commitdiff
|
tree
2010-07-20
Br
a
nd
o
n Casey
t
/READ
M
E:
clarify test_must_fail desc
r
iption
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-20
G
r
eg
Brockman
Check size of path buffer be
f
o
r
e writin
g
into it
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
J
unio C Hamano
M
e
rge
b
ranch
'
maint'
commit
|
commitdiff
|
tree
2010-07-19
R
a
l
f
Thie
l
ow
update-server-info
:
Short
e
n read_pack_info_fi
l
e
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Ævar Arnfjö
r
ð B
j
a
r
mason
git a
d
d: Add --ignore-mis
s
ing to SY
N
OP
S
IS
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Æ
va
r
Arnfjörð Bja
r
mason
git submodule add: Remove ol
d
d
o
c
s a
b
out implicit
-
f
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
J
e
ns Lehmann
git subm
o
dule add: Requi
r
e th
e
new --force option to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Junio C Hamano
Merg
e
branch 'jl/add-
n
-
ig
n
ore-missing'
commit
|
commitdiff
|
tree
2010-07-19
David Aguilar
Documentation:
Explain g
i
t-mer
g
etool's use of temporary
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-16
J
u
n
i
o
C Hama
n
o
Merg
e
bran
c
h 'jc/diff-merge-base-mul
t
i
'
commit
|
commitdiff
|
tree
2010-07-16
Tho
m
as
R
ast
Only run
a
g
g
regate-r
e
sults over actual counts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-16
Jonathan Nied
e
r
Add a samp
l
e user for the svndump library
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-16
Junio C Hamano
diff A
.
.
.
B: do
n
ot limit the synt
a
x too narrow
l
y
commit
|
commitdiff
|
tree
2010-07-15
Junio
C Hamano
Mer
g
e bran
c
h 'jn/paginate-fi
x
'
commit
|
commitdiff
|
tree
2010-07-15
Junio
C
Hamano
Merge branch 'w
p
/m
e
rge-tree-fix'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
M
e
rge
b
ranch '
j
s/merge-rr-fix'
commit
|
commitdiff
|
tree
2010-07-15
J
unio C
H
amano
M
erge branch 'jc/diff-m
e
rge-base-multi'
commit
|
commitdiff
|
tree
2010-07-15
Ju
n
io C Hamano
Merge bra
n
ch
'ns/merge-recursive-uptodate'
commit
|
commitdiff
|
tree
2010-07-15
Juni
o
C Hama
n
o
Merge branch 'jn/t
e
sts
'
commit
|
commitdiff
|
tree
2010-07-15
J
unio C Hamano
Merge br
a
nc
h
'eb/d
o
c-log-manpage'
commit
|
commitdiff
|
tree
2010-07-15
Junio C
H
a
m
a
no
Merge branch 'jn/grep-op
e
n'
commit
|
commitdiff
|
tree
2010-07-15
Juni
o
C Ha
m
ano
Me
r
g
e br
a
nch 'mg/revision-d
o
c'
commit
|
commitdiff
|
tree
2010-07-15
Junio
C
Hamano
M
e
rge branch
'
jk/maint-status-k
e
ep-
i
ndex
-
timestam
p
'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Ham
a
no
M
e
r
ge branch 'jc/re
b
ase-
i
-commit-m
s
g-
f
i
x'
commit
|
commitdiff
|
tree
2010-07-15
Ju
n
io C Ham
a
no
Mer
g
e
b
ranch
'ab/
s
ubmodule-a
d
d-f'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merge
b
r
anc
h
'bc/maint-m
a
ke
f
ile-fix
e
s'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
M
erg
e
branch 'maint'
commit
|
commitdiff
|
tree
2010-07-15
Jonathan Nieder
Docume
n
tation: add sub
m
odu
l
e
.
* to the
b
ig c
o
nfigurati
o
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-15
Jonathan Nieder
git
m
o
dule
s
.
5: ur
l
can
b
e a
rela
t
ive path
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-15
Pavan Kumar Sunkara
gitwe
b
: f
i
x esc_url
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
J
onathan Nieder
git --pagi
n
ate: paginate
e
xternal commands
again
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
J
a
y Soffian
MERGE
_
R
R
i
s
in
.
git,
not
.
g
i
t/rr-cache
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
Will Pa
l
me
r
merge-tree: f
i
x
where tw
o
bran
c
hes share no changes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
W
i
ll Palmer
add basic
t
es
t
s for merge-t
r
ee
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
Junio
C
Haman
o
Git 1
.
7
.
2
-
rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
Jun
i
o C Ha
m
ano
Merge bra
n
ch 'jc/re
a
d-tree-
c
ache-tree-fix'
commit
|
commitdiff
|
tree
2010-07-14
Raja
R
H
a
r
i
n
a
th
Use dev_t for device id (s
t
_dev) from s
t
at in setup_git_
d
ir
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-13
Junio C
H
a
mano
diff A
.
.
.
B: giv
e
on
e
p
o
s
s
ib
l
e diff whe
n
th
e
re are more
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-13
J
unio C
H
a
m
an
o
Mer
g
e branch 'maint'
commit
|
commitdiff
|
tree
2010-07-13
Oren H
e
ld
git fetc
h
do
c
um
e
ntati
o
n: de
s
cribe short
'
-p' synonym
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-13
Mik
l
o
s
Vajn
a
format-patch:
d
ocument the format
.
to configuration
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-12
Jens Lehma
n
n
git add: Ad
d
t
h
e
"--ignore-missing" option for the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-12
Mi
c
h
ael
J
Gruber
test-lib: TAP compliance fo
r
skipping
t
ests on request
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-12
M
i
chael J Gruber
test-lib: simplify GIT_SKIP_TES
T
S lo
o
p
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-12
Junio
C
Hamano
Merg
e
bran
c
h 'main
t
'
commit
|
commitdiff
|
tree
2010-07-12
Jonathan
N
iede
r
t3000
(
l
s
-files -o): modernize style
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-10
Fredri
k
Skolmli
Documentation:
Spel
l
i
ng
fix in
p
ro
t
ocol-capabiliti
e
s
.
txt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Nic
o
la
s
Sebrecht
merge
-
re
c
ursive: use "up-to
-
d
a
te" instea
d
of "uptodate
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Nico
l
as Sebrec
h
t
che
c
kout: accord documentation t
o
wh
a
t git d
o
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Jo
h
annes Si
x
t
t
0
005:
w
ork aroun
d
strang
e
$
? in ksh
w
h
en pr
o
g
ram t
e
r
m
inated
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
J
u
n
io C Hamano
M
erge remote
b
ranch 'ko/ma
s
ter' into j
c
/re
a
d-tree-cache
.
.
.
commit
|
commitdiff
|
tree
2010-07-09
B
o
Y
a
ng
di
f
f
.
c
: fi
x
a graph out
p
ut bug
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Æv
a
r Arnfjörð Bjarma
s
on
tes
t
s
:
Use s
k
ip_al
l
=
*
t
o s
k
i
p
tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Juni
o
C Hamano
Fix "
r
e
ad
-
tree -m A B" primi
n
g the c
a
che
-
tre
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Eli Barzilay
Reorgani
z
e `g
i
t
-
log' man page t
o
cl
a
rify
comm
o
n
diff
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Nazri R
a
m
l
iy
grep -
O
: Do no
t
pass color
seque
n
ces as filenames to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
J
u
nio C Hama
n
o
Git 1
.
7
.
2
-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Junio C Hamano
Merg
e
b
r
anch 'ab/t
a
p'
commit
|
commitdiff
|
tree
2010-07-07
Junio C
H
amano
Merge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2010-07-07
J
u
nio C
H
amano
b
a
c
kmerge a few more f
i
xes to
1
.
7
.
1
.
X series
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Junio C Hamano
M
e
rge b
r
anch 'maint-1
.
6
.
4
'
in
t
o maint
commit
|
commitdiff
|
tree
2010-07-07
U
w
e Kl
e
i
ne-König
rev-parse: fix --
p
ar
s
e-opt --keep-dashdas
h
--
s
top-at
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Juni
o
C Ham
a
n
o
M
e
rge bra
n
ch '
m
g/doc-rev-pars
e
-tree
p
ath-
s
y
n
t
a
x'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2010-07-07
Junio C H
a
ma
n
o
Me
r
ge branch 'tr/receive-p
a
c
k-a
l
iased-update-fi
x
' into
.
.
.
commit
|
commitdiff
|
tree
2010-07-07
Pie
r
re Habouzi
t
fix git branch
-m in p
r
esence
o
f c
r
oss d
e
vices
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
B
r
andon Casey
t/t0006: specify timezone a
s
EST5
n
ot EST to
c
o
m
p
l
y
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Junio C Hamano
do
n
ot wr
i
te o
u
t index when status
d
o
es not have to
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Junio C Hamano
Merge branch
'
maint'
commit
|
commitdiff
|
tree
2010-07-07
Heiko Voigt
add
m
i
ssing &
&
t
o submodule-m
e
rg
e
testcase
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Jonathan Nie
d
er
t/R
E
ADME: document more
t
est helpers
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Br
a
ndon Casey
M
akefil
e
:
w
ork around ksh's
f
ailure to
h
a
ndle missing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-06
Jeff King
test-date: fix sscan
f
type conver
s
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-06
Junio C Hamano
M
e
rge branch 'm
a
in
t
'
commit
|
commitdiff
|
tree
next