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 --no-ff --no-commit correctly
2010-08-18
Jonath
a
n Nieder
merge script: handle
-
-n
o
-ff --no-co
m
mit correctly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jon
a
t
h
an Niede
r
m
e
r
ge script: --ff-only to
d
isallo
w
t
r
ue merge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
J
o
nat
h
a
n N
i
ede
r
m
e
rg
e
script
:
han
d
le
many-wa
y
oct
o
pus
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
mer
g
e
sc
r
ipt: handle -m
-
-log correctl
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
J
o
n
a
than
Nie
d
er
m
erge s
c
rip
t
: f
o
rbid merge -s
index
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
merge script: allow cu
s
tom
strategies
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonat
h
an Ni
e
der
merge script: merge -
X
<opti
o
n
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
m
e
rge script: im
p
r
o
ve
l
og message subject
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
m
erge script: r
e
fu
s
e
t
o merge d
u
ri
n
g
m
erg
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonath
a
n
Nied
e
r
merge script: tweak unm
e
r
ged files message to m
a
tch
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
merge script: --squash, -
-
ff
f
ro
m
un
b
or
n
br
a
nch are
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonatha
n
Nieder
fmt-m
e
rge-msg -m
t
o override merg
e
title
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
J
on
a
than Nieder
merge-
b
ase --indepe
n
d
e
nt t
o
print redu
c
ed
p
arent list
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan
N
iede
r
merge-base --oct
o
p
us to mi
m
ic
s
how-branch
-
-merge-
b
ase
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
D
o
cum
e
n
t
a
tion: ad
d
a SEE ALSO
s
e
c
t
ion f
o
r
m
e
rge
-
base
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jon
a
than Nieder
t6200 (f
m
t-merge-msg): style nitpicks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan N
i
eder
t
6
010
(
m
er
g
e-base): modernize style
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
t7600 (merge): test merge from
branch
y
et to be
born
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonath
a
n
Nieder
t
7
600 (merge):
c
heck refl
o
g entry
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jo
n
ath
a
n Nie
d
er
t76
0
0 (merge)
:
do not launch gitk for --debug
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
J
o
nathan Niede
r
t7600 (me
r
ge): moderni
z
e
sty
l
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nied
e
r
me
r
ge: do not mistake (ance
s
tor
o
f) tag
f
or branch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-21
Junio
C
Hamano
G
i
t 1
.
7
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-21
Junio C Hamano
tests
:
c
o
r
rect
"
doe
s
refl
o
g exist?"
t
ests
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-21
Bra
n
d
on
Casey
t/
:
work
aro
u
nd one-shot variable as
s
ignment with test
_
m
ust_fail
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-21
J
onat
h
an Nieder
t/README: correct an exception when breaking
a
&
&
cha
i
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
Br
a
ndon Casey
t/{t5541,lib-http
d
}: replace problema
t
ic '
!
()' notation
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
Brandon Casey
t
/t3700:
c
onvert two u
s
es of n
e
g
ation operator '!'
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
Junio C Ha
m
ano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-07-20
Brand
o
n
C
as
e
y
t/README
:
c
l
ari
f
y test_must_fail description
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
Greg
Brockman
Check size of
p
ath buff
e
r before writing
into it
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Jun
i
o C Hamano
Me
r
ge bra
n
ch 'main
t
'
commit
|
commitdiff
|
tree
2010-07-19
R
a
lf
T
hielow
up
d
ate-server-info
:
S
ho
r
ten re
a
d
_
p
a
c
k_inf
o
_file(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Ævar Arnfj
ö
rð Bjarmason
git add
:
A
d
d --ignore-mis
s
ing to
S
YNOPSI
S
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Ævar Arnfjörð Bjarma
s
on
git sub
m
odule add: Remove old docs about
implicit -f
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Jens Lehmann
g
i
t submodule add: Require
the new --force option to
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Junio C
H
amano
M
erge branch 'jl/add-n-i
g
nore-missing'
commit
|
commitdiff
|
tree
2010-07-19
Da
v
id Aguilar
Documentation: Explain git-mergetoo
l
's us
e
of tempor
a
ry
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-16
Junio C Hamano
Merge branch 'jc/diff-me
r
g
e
-base
-
mul
t
i'
commit
|
commitdiff
|
tree
2010-07-16
Tho
m
as
R
ast
Only run aggreg
a
te-
r
esults over actu
a
l cou
n
ts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-16
Jo
n
athan Nied
e
r
Add a
s
ample
use
r
for the sv
n
dump libr
a
ry
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-16
Junio C Hamano
diff
A
.
.
.
B: do no
t
li
m
i
t
the
s
ynt
a
x
too narrowly
commit
|
commitdiff
|
tree
2010-07-15
J
u
ni
o
C Hamano
Merge branch 'jn/pa
g
inate-fix'
commit
|
commitdiff
|
tree
2010-07-15
Juni
o
C
H
amano
M
e
r
g
e bran
c
h '
w
p/merge-tree-fix'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Me
r
ge b
r
anch
'
js/me
r
ge-r
r
-fix'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merge b
r
anch 'jc/diff-merg
e
-base-multi'
commit
|
commitdiff
|
tree
2010-07-15
J
u
nio C Hamano
Merge branch
'ns/merge-rec
u
rs
i
ve-upt
o
date'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Mer
g
e
b
ra
n
ch '
j
n/
t
e
s
t
s
'
commit
|
commitdiff
|
tree
2010-07-15
J
un
i
o
C H
a
mano
Merge br
a
nch 'eb/doc-
l
og-manpa
g
e'
commit
|
commitdiff
|
tree
2010-07-15
Ju
n
io C H
a
mano
Me
r
ge br
a
nch 'jn
/
grep-op
e
n'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merg
e
b
r
anch
'mg/revision-doc'
commit
|
commitdiff
|
tree
2010-07-15
Ju
n
io C Hamano
Me
r
ge branc
h
'jk
/
m
a
int-status-ke
e
p-i
n
de
x
-time
s
tamp'
commit
|
commitdiff
|
tree
2010-07-15
Junio C
H
amano
Merge branch 'jc/rebas
e
-i-
c
ommit-msg-fix'
commit
|
commitdiff
|
tree
2010-07-15
J
uni
o
C
Hamano
Merge bran
c
h
'ab/subm
o
dule
-
add-f'
commit
|
commitdiff
|
tree
2010-07-15
Ju
n
i
o
C
H
amano
Merge
b
r
anch 'bc/maint-makefi
l
e-fi
x
es'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Ham
a
no
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-07-15
Jon
a
than Niede
r
Documentation: add submodule
.
*
t
o the big confi
g
uration
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-15
Jonathan
Nieder
gitmodules
.
5: url c
a
n be a
relat
i
v
e
path
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-15
Pavan Kumar Sunkara
gitweb: fix
e
s
c_url
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
Jonathan
N
ieder
git --paginate: paginate external commands
a
gain
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
Jay Soffian
MERGE_
R
R is
in
.
git,
n
ot
.
git/rr-c
a
che
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
Will Palmer
merge
-
t
r
e
e: fix
wh
e
re tw
o
branc
h
es share n
o
c
hanges
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
Will
Palmer
add bas
i
c tests for mer
g
e
-
tree
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
Junio
C Hama
n
o
G
it 1
.
7
.
2-rc3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
J
u
nio C Hamano
Merge
b
ran
c
h
'jc/
r
ea
d
-
t
ree-cache-tree-fix'
commit
|
commitdiff
|
tree
2010-07-14
R
a
ja R Harinat
h
U
se dev_
t
for device i
d
(st_dev) from
s
tat in setup_git_d
i
re
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-13
Junio C Hamano
diff A
.
.
.
B:
g
ive
one p
o
ssi
b
le diff when there
a
re more
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-13
Junio C
Hamano
M
e
rge b
r
anc
h
'maint'
commit
|
commitdiff
|
tree
2010-07-13
Ore
n
Held
git fetch
d
ocument
a
tion: desc
r
ibe short '
-
p'
s
ynonym
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-13
M
iklos Vajna
format-p
a
tc
h
: document the for
m
at
.
to c
o
nfiguration
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-12
J
ens Lehmann
git
a
dd: Add
t
he "--ignore-missing
"
o
p
tion fo
r
the
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-12
Michael J Gr
u
ber
test-l
i
b
:
T
AP complian
c
e
f
or skipping tests on req
u
est
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-12
M
i
c
hael J Gruber
test-lib: simplify G
I
T_SKIP_TESTS loop
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-12
Junio C Hamano
Me
r
g
e
b
r
an
c
h 'm
a
int'
commit
|
commitdiff
|
tree
2010-07-12
Jon
a
th
a
n Nieder
t
3
0
0
0
(ls-files -o): mod
e
rnize style
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-10
Fredrik Skolmli
Docum
e
ntation: Spelling fix in protocol-capa
b
ilities
.
tx
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
Nicolas S
e
brech
t
me
r
ge-recursive
:
use
"u
p
-to-da
t
e" instead of "u
p
t
o
d
a
t
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
Ni
c
olas Sebrecht
ch
e
ckou
t
: accord doc
u
m
entation to what gi
t
does
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
Johanne
s
Sixt
t0
0
05: work
aro
u
nd
strang
e
$? in ksh when pr
o
g
r
am terminated
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
J
u
ni
o
C
Hamano
Merge rem
o
te
branch 'ko/m
a
ster' into j
c
/read-tree-cache
.
.
.
commit
|
commitdiff
|
tree
2010-07-09
B
o
Y
ang
diff
.
c:
f
i
x
a grap
h
outpu
t
b
ug
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
Ævar Arnfjörð
B
jarmason
tests: Use skip_all=* t
o
skip tests
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
J
u
n
io
C Ham
a
no
F
i
x
"rea
d
-tree -
m
A B"
p
rim
i
n
g
the cache
-
tree
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
Eli
B
arzilay
Reorgani
z
e `git-
l
og' m
a
n pa
g
e to clarify common di
f
f
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Na
z
ri Ramliy
grep -O: Do not pass co
l
o
r
seq
u
e
nces as filenames to
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Junio C Hamano
Git 1
.
7
.
2-
r
c2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Junio C Hamano
M
e
rge bran
c
h 'ab/t
a
p'
commit
|
commitdiff
|
tree
2010-07-07
J
unio C Ha
m
ano
Merge br
a
nc
h
'maint'
commit
|
commitdiff
|
tree
2010-07-07
Junio C Hamano
b
a
ckmerge a few more
f
ix
e
s to 1
.
7
.
1
.
X s
e
r
ies
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Junio C Hamano
Merg
e
branch 'maint-1
.
6
.
4' into maint
commit
|
commitdiff
|
tree
2010-07-07
Uwe Kleine-König
rev-p
a
r
se: fix -
-
p
a
rse
-
o
p
t --ke
e
p-d
a
sh
d
ash --stop-at
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Junio C Hamano
Merge branch 'mg/doc-
r
e
v-p
a
rse-t
r
eepath-sy
n
tax' into
.
.
.
commit
|
commitdiff
|
tree
2010-07-07
Junio
C H
a
mano
Merg
e
branch 'tr/rece
i
ve-
p
a
ck-
a
liase
d
-update-fix' into
.
.
.
commit
|
commitdiff
|
tree
2010-07-07
Pi
e
rre
Habou
z
it
fix git branc
h
-m in pres
e
nce
of cross devices
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Brand
o
n Casey
t/t0006:
spec
i
fy
t
im
e
zone
as EST5
n
ot EST to comply
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
J
u
nio C
Hamano
do
not
w
rite out index when st
a
tus does
n
ot have to
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Junio C
H
am
a
no
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-07-07
Heiko Vo
i
gt
add missing && to
s
u
bmodule-m
e
rge
t
e
s
t
case
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Jonat
h
an Nied
e
r
t/README:
do
c
ument
m
ore t
e
st h
e
lper
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Brand
o
n Casey
Make
f
ile
:
work around k
s
h's
failure to handle
m
issing
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next