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
t6200-fmt-merge-msg: Exercise '--log' to configure shortlog length
2010-09-09
Ramkum
a
r Ram
a
c
h
a
ndra
t6200-fmt-
m
erge-msg
:
Exercise '--
l
og' to c
o
nfigure
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-09
Ramkum
a
r Ramacha
n
dra
t6200-
f
m
t-merge-msg: Exercise 'mer
g
e
.
log' t
o
configure
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-09
Ramkumar Ramachandra
merg
e
:
M
ake 'merg
e
.
lo
g
'
a
n integer
or boolea
n
opt
i
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-09
Ramkumar Ramachandra
merge: Ma
k
e
'--log' an integer optio
n
for number of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-09
Ramku
m
ar
R
amach
a
ndra
f
m
t_merg
e
_msg: Ch
a
nge fmt_merge_msg API
t
o
a
c
cept sh
o
rtlog_l
e
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
merge script: le
a
rn --[no
-
]
rere
r
e-
a
uto
u
p
date
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
merge
s
cript: no
t
i
c
e @{-1} shorth
a
nd
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nie
d
er
merge script:
h
an
d
l
e --no-ff -
-
n
o-commit correctly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonat
h
an Nieder
merg
e
scrip
t
: --ff-only to disal
l
ow tru
e
merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
J
o
nathan Nie
d
er
m
e
r
g
e scr
i
pt: handle many-way
o
ctop
u
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan
Nieder
mer
g
e
script: handle -m
-
-log correctly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan
Nieder
m
erge s
c
ript
:
forbid merge -s
i
ndex
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
J
o
nathan Nie
d
e
r
merge scri
p
t: all
o
w
c
ustom strat
e
gies
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonatha
n
Nieder
merge script: mer
g
e -X<option>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
J
o
n
athan Nied
e
r
merge script: improve log messag
e
s
ubje
c
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan N
i
ede
r
merge
s
cript: refu
s
e to merge during merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
m
e
rge scri
p
t: twea
k
unmerged files message to match
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonat
h
an Nieder
merge script: --squa
s
h, --f
f
from unb
o
rn branch are
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
J
o
n
a
than Nieder
fmt-m
e
rge-msg -m to ov
e
rride m
e
rge
t
itle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan N
i
eder
merge-
b
ase --
i
ndep
e
ndent to pr
i
nt reduce
d
parent list
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jon
a
than Nieder
merge-base --octopus
t
o mimi
c
show-branch
--merge
-
base
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan N
i
eder
D
o
cumenta
t
ion:
add a SEE
ALSO s
e
ction
for merge-base
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jona
t
ha
n
Nieder
t6200 (fmt-merge-msg): style nitpicks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonatha
n
Ni
e
d
e
r
t6010
(merg
e
-base):
m
o
d
ernize style
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan
N
ieder
t
7600 (
m
erge): test merge from branch yet t
o
b
e born
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan N
i
eder
t7600 (me
r
ge): chec
k
reflog entr
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
t7
6
00
(
merge): do
not launch git
k
f
or --debu
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Ni
e
der
t7
6
00 (
m
erge): modernize s
t
yl
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jona
t
h
a
n Nieder
merge: do not m
i
stake (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
amano
Git 1
.
7
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-21
Junio C
Hamano
tes
t
s:
correct "does reflog e
x
ist?" tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-21
Br
a
nd
o
n Casey
t/:
w
ork around one-sho
t
variab
l
e assignment wi
t
h test_
m
ust_
f
ail
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-21
Jonathan Ni
e
der
t/RE
A
DME: correct a
n
exception when breaking a
&& chain
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-20
Brandon Casey
t/{t5541,
l
ib-httpd}: replace problematic '!()' notation
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-20
Brandon
C
asey
t
/
t37
0
0:
c
onvert two
u
ses of negation op
e
rator '
!
'
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-20
J
u
nio C Haman
o
Merge branch
'
m
aint'
commit
|
commitdiff
|
tree
2010-07-20
Brandon Casey
t/READ
M
E:
c
l
arif
y
test_must_
f
a
i
l descriptio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-20
Greg Brockman
C
h
eck si
z
e
of path buff
e
r before writing into
i
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Junio
C
Haman
o
M
erge branch 'm
a
in
t
'
commit
|
commitdiff
|
tree
2010-07-19
Ralf
T
hielow
up
d
ate-serv
e
r-info: Shorten
r
e
a
d_pack
_
i
nfo_file()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Ævar Arnfjörð Bj
a
rmason
git add: A
d
d
--i
g
nore-missi
n
g t
o
SYNOPSIS
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Ævar Arn
f
j
ö
rð Bjarmason
git submodul
e
a
d
d
: R
e
move old docs a
b
out implicit -f
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
J
e
ns L
e
h
mann
git submodule ad
d
: Require the new --force opt
i
on
t
o
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Juni
o
C Hamano
Merge bran
c
h 'jl/add-
n
-ignore-missing'
commit
|
commitdiff
|
tree
2010-07-19
Da
v
id Aguilar
Documentation:
Ex
p
lain git
-
m
e
rgetoo
l
'
s
use of
temporary
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-16
Jun
i
o C Hamano
M
erge branch
'jc/diff-mer
g
e
-base-mu
l
ti'
commit
|
commitdiff
|
tree
2010-07-16
Thomas
R
ast
Only ru
n
agg
r
egate-res
u
lts over actual
counts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-16
J
ona
t
han Nieder
Add a
sample u
s
er
f
o
r
the
s
vndump l
i
brary
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-16
J
unio C
Hamano
diff
A
.
.
.
B: do not limit t
h
e
synta
x
too narrowly
commit
|
commitdiff
|
tree
2010-07-15
Jun
i
o C Ham
a
no
Me
r
ge bra
n
ch 'jn/paginate-fix'
commit
|
commitdiff
|
tree
2010-07-15
Junio
C
Hamano
Mer
g
e branch 'wp
/
m
e
rge-tree-fix'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merge bra
n
ch 'js/
m
erge-rr-fix'
commit
|
commitdiff
|
tree
2010-07-15
J
u
nio C H
a
mano
Merge
b
r
a
nch
'
jc
/
diff-merge-base-m
u
l
ti'
commit
|
commitdiff
|
tree
2010-07-15
Junio C
H
amano
M
erge branch 'ns/merge-recursi
v
e
-
upt
o
date'
commit
|
commitdiff
|
tree
2010-07-15
Junio
C
H
amano
M
erge branch 'jn/tests'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Ham
a
no
M
e
rge branc
h
'eb/
d
oc
-
l
o
g-m
a
npa
g
e'
commit
|
commitdiff
|
tree
2010-07-15
J
u
nio C Ha
m
ano
Merge branch 'jn/grep-
o
pen'
commit
|
commitdiff
|
tree
2010-07-15
Junio C
H
amano
Merge branch 'mg/revision-doc'
commit
|
commitdiff
|
tree
2010-07-15
Junio C
H
a
m
an
o
M
e
rge branch '
j
k/main
t
-status-k
e
e
p
-i
n
dex-timestamp'
commit
|
commitdiff
|
tree
2010-07-15
Jun
i
o C Haman
o
Me
r
ge branch 'j
c
/rebase
-
i-commi
t
-msg-fix'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merge bran
c
h
'ab/submodule
-
add-f'
commit
|
commitdiff
|
tree
2010-07-15
Junio
C
H
a
mano
Merge branc
h
'bc/maint-make
f
i
l
e-fix
e
s'
commit
|
commitdiff
|
tree
2010-07-15
Junio C
Ham
a
n
o
M
e
rge branc
h
'maint'
commit
|
commitdiff
|
tree
2010-07-15
J
o
n
at
h
a
n
Nieder
Do
c
umentat
i
on: add submodule
.
* to the big configur
a
tion
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-15
J
o
nathan Ni
e
der
gitmodules
.
5: url can be a re
l
ative path
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-15
P
avan K
u
mar Sunk
a
ra
git
w
eb: fix esc_url
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
Jonathan
Nieder
git --pag
i
nate
:
pagin
a
te ext
e
rnal comman
d
s
again
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
Jay So
f
fian
MERGE_RR is i
n
.
g
i
t, not
.
git/r
r
-
c
a
c
h
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
W
i
l
l Palme
r
merge-tree: fix where
t
wo b
r
anches share no
ch
a
nges
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
Wil
l
Palmer
add basic tests for
m
erg
e
-
t
ree
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
Junio C Hamano
Git 1
.
7
.
2-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
Ju
n
io C
H
amano
Merge branch
'
jc/re
a
d-tree-cache-
t
ree-fix'
commit
|
commitdiff
|
tree
2010-07-14
Raja R Harinath
Use
d
ev_t for device
i
d
(
st_dev)
from stat in setup_g
i
t_dire
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-13
Junio C
Haman
o
diff A
.
.
.
B: gi
v
e one p
o
s
s
i
ble diff
w
h
e
n
t
here are more
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-13
Junio C Ham
a
n
o
Merge
bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2010-07-13
Oren Held
git fetch documentati
o
n: describe short
'-p' s
y
nonym
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-13
M
iklo
s
V
a
jna
format-patc
h
:
document
the forma
t
.
to conf
i
gurati
o
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-12
Jens Lehmann
git add:
A
dd the
"
--ignore-miss
i
n
g" optio
n
for the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-12
Mi
c
hael J Grube
r
test-lib
:
TAP
c
omplia
n
ce for sk
i
p
ping tests on r
e
quest
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-12
Michael J Gruber
te
s
t-lib: s
i
mplify GIT_SKIP_TESTS loop
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-12
J
unio C
Ha
m
ano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-07-12
Jonathan Nieder
t3000 (ls-f
i
les -
o
): modern
i
z
e
style
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-10
Fredr
i
k Skolmli
D
ocumentation: Sp
e
l
l
i
n
g fix
i
n protocol-c
a
p
abilities
.
txt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Nicolas
Sebr
e
c
h
t
merge-recursive: use "up-to-date
"
i
n
s
t
ead of "upt
o
date
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Nic
o
las
Sebrec
h
t
ch
e
c
k
ou
t
: accord docume
n
t
a
tion
to what git does
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Johan
n
es Sixt
t0005: work a
r
ound strange $
?
in ksh when pro
g
r
a
m ter
m
inated
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Junio C H
a
m
ano
Merge remote branch 'ko/maste
r
' into
j
c
/
read
-
t
r
ee-cache
.
.
.
commit
|
commitdiff
|
tree
2010-07-09
Bo Yang
diff
.
c: fix a
graph output bug
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Æ
v
ar Arnfj
ö
rð B
j
armason
tests:
Use
s
kip_al
l
=* to skip tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Junio C Haman
o
Fix "read-tree -m A B" priming the
c
ache-tree
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Eli
Bar
z
ilay
R
eo
r
gani
z
e
`git-lo
g
' man pag
e
to cla
r
i
f
y common dif
f
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Nazri Ramliy
gr
e
p -O: Do no
t
pass
color seq
u
e
nces as
filenam
e
s to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Ju
n
io C
Hamano
Git 1
.
7
.
2-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Junio C Hamano
Merge br
a
n
ch 'ab/tap'
commit
|
commitdiff
|
tree
2010-07-07
J
unio C Hamano
Merge branch
'
m
aint'
commit
|
commitdiff
|
tree
2010-07-07
Junio C Hamano
backmerge a
few more fixe
s
to 1
.
7
.
1
.
X series
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Junio C
H
am
a
no
M
e
rge branch 'maint-
1
.
6
.
4' into maint
commit
|
commitdiff
|
tree
2010-07-07
Uwe Kleine-
K
ön
i
g
rev-parse
:
fix --parse
-
opt --keep-da
s
hdash --stop-at
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Junio C H
a
ma
n
o
Merge bra
n
ch 'mg/doc
-
rev-parse-treepat
h
-syntax' into
.
.
.
commit
|
commitdiff
|
tree
2010-07-07
Junio C Hamano
M
erg
e
branch 'tr/receive
-
pa
c
k-aliased-update-fix' i
n
to
.
.
.
commit
|
commitdiff
|
tree
next