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
t6200-fmt-merge-msg: Exercise '--log' to configure shortlog length
2010-09-09
Ramkumar Ramachandra
t62
0
0-fmt-merge-msg: Exercise '--log
'
to con
f
igure
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-09
Ramkumar Ramach
a
ndr
a
t620
0
-fmt-merge
-
msg:
Exercise 'merg
e
.
log'
t
o
configur
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-09
Ram
k
u
m
ar Ramachandra
me
r
g
e
: Make '
m
erge
.
log' a
n
integer or b
o
o
l
ean option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-09
R
amku
m
a
r
Ramacha
n
d
ra
merge: Ma
k
e '--log'
a
n
i
nteger opti
o
n for numb
e
r of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-09
Ramkumar Ramachandra
f
mt_merge_msg: C
h
ange fmt_merge_msg API to a
c
cep
t
s
hortlog_
l
en
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jon
a
tha
n
Nieder
merge
s
cript:
l
earn
-
-[no-
]
rerer
e
-autoupdate
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jo
n
athan Nieder
merge
script: n
o
tice @{-1} sho
r
thand
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
J
onathan
Nieder
m
e
rge
sc
r
i
p
t
:
ha
n
d
le --no-
f
f --no-
c
ommit cor
r
ectly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
J
on
a
than Nieder
merg
e
sc
r
i
p
t:
-
-
ff-onl
y
to dis
a
l
l
o
w
true merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
J
o
n
a
than
N
ieder
me
r
ge script: handle many-w
a
y
o
c
topus
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
m
e
rge script:
h
andle -m --log correctly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jo
n
athan
N
ieder
m
e
rg
e
script: forbid
merge -s index
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
merg
e
scri
p
t: allow c
u
s
t
om str
a
t
eg
i
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
J
onat
h
an
N
ieder
merge
s
cript: merge
-X<optio
n
>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
J
o
nat
h
an Nieder
merg
e
script: im
p
rove log mes
s
a
ge
s
u
bject
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jona
t
han Nie
d
er
merge
script:
r
efuse to m
e
r
g
e
d
u
ring merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonatha
n
Nieder
me
r
ge script: tweak unmerged f
i
les message
to match
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonat
h
an Ni
e
der
merg
e
script: --
s
quash
,
--ff fro
m
u
nborn
branch
a
re
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
f
mt-merge-msg -m to o
v
erride merge title
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
J
o
nathan Nieder
merge-base
-
-independent to pr
i
n
t reduced parent list
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan N
i
eder
merge-bas
e
-
-octopus to mimi
c
show-branch --m
e
rge-b
a
se
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jon
a
t
h
an Niede
r
D
ocum
e
ntation: add a
S
EE ALSO section for
m
erge-
b
ase
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jo
n
athan Nied
e
r
t6
2
00 (fmt-merge-msg)
:
style ni
t
picks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan N
i
e
d
e
r
t6010 (merge
-
base)
:
modernize
s
tyle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonat
h
an N
i
eder
t7600 (merge)
:
test m
e
rge f
r
o
m
b
ranch y
e
t to b
e
born
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonat
h
an Ni
e
de
r
t7600 (merge): ch
e
c
k ref
l
og entry
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nied
e
r
t7600
(me
r
ge): do not launch git
k
f
o
r --debug
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jona
t
han Nieder
t76
0
0
(merg
e
)
: mo
d
ern
i
ze
style
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jona
t
han
Nieder
me
r
ge:
do not m
i
stake (ancestor of) ta
g
for br
a
nch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-21
Junio C Haman
o
Git 1
.
7
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-21
Junio C Haman
o
t
ests: correct "
d
oes r
e
flog exist
?
" tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-21
Brandon Ca
s
ey
t/: work around
o
n
e
-shot variable ass
i
gnment with test_must_fail
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-21
J
o
nathan Nieder
t
/README: c
o
rrect an e
x
c
ep
t
ion when breaking a && c
h
ai
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-20
Bran
d
on Casey
t/{t5541,lib-httpd}: re
p
lace problematic '!(
)
' notation
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-20
Br
a
ndon
Casey
t/t3700: convert tw
o
uses of
ne
g
ation oper
a
tor '!'
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-20
Junio
C
Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-07-20
Brandon
C
asey
t
/RE
A
D
ME:
c
larify t
e
st_must_fail descripti
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-20
Gre
g
Brockm
a
n
Check
s
ize
of
p
a
t
h
b
u
ffer b
e
fore writi
n
g int
o
it
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
J
u
nio
C Haman
o
Me
r
ge branch 'maint'
commit
|
commitdiff
|
tree
2010-07-19
Ralf
T
h
ielow
update
-
s
erver-info: Shorten read_pack_info_fi
l
e()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Ævar A
r
nfjörð Bja
r
ma
s
o
n
git add:
Add --
i
gnore-mis
s
ing to SYNOPSIS
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Æva
r
A
r
nfjörð Bjarmason
git submodule
a
dd: Remov
e
old do
c
s
a
bout implici
t
-f
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Jens
L
ehmann
g
i
t su
b
module add: Require
the n
e
w --f
o
rce
o
ption to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Junio C Hamano
Merge br
a
nch 'j
l
/add-
n
-
i
gnore-missing'
commit
|
commitdiff
|
tree
2010-07-19
Davi
d
Aguilar
D
ocu
m
entation: Exp
l
ain git-mergetool's
use of t
e
mpora
r
y
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-16
J
u
n
io C Ha
m
ano
Merge br
a
nch 'jc/diff-merge-base-multi'
commit
|
commitdiff
|
tree
2010-07-16
Thomas Rast
Only run aggregate-results over actua
l
counts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-16
Jon
a
than Nieder
Add a
s
ample user for the
s
vndump
l
ibrary
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-16
J
unio C Hamano
diff A
.
.
.
B:
do
n
ot l
i
mit the
s
yntax too narrowly
commit
|
commitdiff
|
tree
2010-07-15
Ju
n
i
o
C Hama
n
o
Merge
b
ranch 'jn/paginate-fix'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
M
erg
e
branch 'wp/merge-tree-fix'
commit
|
commitdiff
|
tree
2010-07-15
Junio
C Ha
m
ano
Merge branch '
j
s/m
e
rge-rr-fix'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Ha
m
ano
Merge
b
ranch 'j
c
/diff-merge-base-m
u
lti
'
commit
|
commitdiff
|
tree
2010-07-15
Jun
i
o
C Hamano
Merge branch 'ns/mer
g
e
-
recursive-uptodate'
commit
|
commitdiff
|
tree
2010-07-15
J
u
n
io C Hamano
Merge bran
c
h 'jn/tests'
commit
|
commitdiff
|
tree
2010-07-15
Ju
n
io
C Ha
m
ano
Mer
g
e branch 'eb/doc-log-manpage'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Mer
g
e
b
r
anch
'
jn/grep
-
open'
commit
|
commitdiff
|
tree
2010-07-15
J
u
n
io C Hamano
Merge bra
n
ch 'mg/r
e
v
i
s
ion-doc
'
commit
|
commitdiff
|
tree
2010-07-15
Jun
i
o C Hama
n
o
Merge branch 'jk/maint-status-keep
-
index
-
t
i
mest
a
mp'
commit
|
commitdiff
|
tree
2010-07-15
Junio C
H
a
man
o
Merge branch
'
jc/rebase-i-c
o
mmit-msg-fix'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merg
e
b
ran
c
h 'ab/su
b
m
odule-add-f'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merge b
r
anch 'bc/ma
i
nt-makefile
-
fixes'
commit
|
commitdiff
|
tree
2010-07-15
Junio C
Hamano
Me
r
ge branch 'maint
'
commit
|
commitdiff
|
tree
2010-07-15
Jonathan Nieder
Documenta
t
ion: add submod
u
le
.
* to the bi
g
conf
i
g
u
r
ation
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-15
Jon
a
t
han
Niede
r
g
i
tmodule
s
.
5
:
u
r
l can
be a relati
v
e
path
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-15
Pavan Kuma
r
Sunkara
g
i
tweb:
f
ix
esc_url
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
Jonatha
n
Nied
e
r
git --paginate: pa
g
inate externa
l
c
omman
d
s again
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
Jay Soffian
MERGE_RR is in
.
git, not
.
git/rr-cache
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
Will Palm
e
r
m
e
rge-tree:
fix where two branc
h
es shar
e
no changes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
Will Palmer
add basic tests for merge-tr
e
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
Junio C Hamano
Git 1
.
7
.
2
-
rc
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
J
u
nio C Ham
a
n
o
Merge branch
'
jc/read-tree-cache
-
tree-fix'
commit
|
commitdiff
|
tree
2010-07-14
Raja R Harinat
h
U
s
e de
v
_t for
d
evice id (st_dev)
from stat in setup
_
git_di
r
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-13
Junio C Hamano
diff A
.
.
.
B: give
one possibl
e
di
f
f
w
hen
ther
e
are m
o
re
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-13
Junio C
H
amano
Merge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2010-07-13
Oren Held
git fetch documentation: describe s
h
ort '-p' syno
n
ym
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-13
M
i
klos
V
ajna
format-patch: document t
h
e format
.
to configuration
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-12
Jens Lehman
n
git add: A
d
d the "--ignor
e
-mi
s
sing" o
p
tion
for th
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-12
Michael J Gruber
te
s
t-lib: TAP compli
a
nce
f
or
s
kipping tes
t
s on
r
equest
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-12
Michael J G
r
uber
test-l
i
b:
simplify GIT_
S
KIP_TESTS
l
oop
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-12
Junio C Haman
o
Merge br
a
n
ch 'maint'
commit
|
commitdiff
|
tree
2010-07-12
J
o
nathan Nieder
t3000 (ls-files -o): moder
n
ize style
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-10
Fredri
k
Skolmli
Documentation: Spelling f
i
x in protocol-c
a
pabilitie
s
.
t
x
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Nic
o
las
S
ebrecht
m
e
rge-re
c
ursive: use "up-to-d
a
te" inst
e
ad of "uptodate
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
N
i
colas Sebrecht
chec
k
o
ut:
ac
c
ord documentation to what git does
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Johanne
s
Sixt
t0005:
w
ork around
strange $?
i
n k
s
h when program terminate
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Junio C Hamano
Merg
e
remote bra
n
ch 'ko/mas
t
er' i
n
to jc/read-tr
e
e-cache
.
.
.
commit
|
commitdiff
|
tree
2010-07-09
B
o Yang
dif
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
Ævar A
r
nfjörð
Bja
r
mason
tests: Use
s
kip_all=* to skip tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Junio C Hamano
Fix "rea
d
-tre
e
-m A B"
pr
i
ming t
h
e cac
h
e-tre
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Eli Ba
r
z
i
lay
R
eorga
n
ize `git-lo
g
' man
p
a
g
e
to cl
a
r
i
f
y common
diff
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Nazri Ramliy
gre
p
-O: D
o
not pass
c
o
lor sequ
e
nces as filenames
t
o
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Junio C H
a
mano
Git 1
.
7
.
2-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Junio C
Hama
n
o
Merg
e
bra
n
ch 'ab/tap'
commit
|
commitdiff
|
tree
2010-07-07
Junio C
Hamano
Merge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2010-07-07
Jun
i
o
C Haman
o
backmer
g
e a f
e
w mor
e
fixes to 1
.
7
.
1
.
X series
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Junio
C
Hamano
Merge b
r
anch
'
maint-1
.
6
.
4' int
o
maint
commit
|
commitdiff
|
tree
2010-07-07
Uwe
Klein
e
-König
r
e
v-
p
arse: fix --pars
e
-opt --keep-das
h
d
ash --
s
top-at
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Ju
n
io
C
H
a
mano
Mer
g
e branc
h
'mg/doc-rev-parse
-
tree
p
a
th
-
syntax'
into
.
.
.
commit
|
commitdiff
|
tree
2010-07-07
Ju
n
io C
Hamano
Merge branch 'tr/receive-pack-ali
a
s
ed-update-fix'
into
.
.
.
commit
|
commitdiff
|
tree
next