repo.or.cz
/
git
/
gitweb.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
R
amachan
d
r
a
t6200-fmt
-
merge-msg: Exercis
e
'--log' to co
n
figure
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-09
Ram
k
uma
r
Ramachandra
t
6200-fm
t
-merge-msg: Exerc
i
se
'
merge
.
log' to co
n
f
igur
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-09
Ramkumar Rama
c
h
a
ndra
merge: Make 'merg
e
.
l
o
g
' an
integer or boolean
op
t
ion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-09
Ramkumar Ramachandra
merge: Make '--lo
g
' an intege
r
option fo
r
number of
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-09
Ram
k
umar
R
amac
h
andr
a
fmt_merg
e
_msg
:
Chang
e
f
mt
_
merge_msg API to accept shortlog_le
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan
N
ieder
mer
g
e
s
cript:
l
e
arn --[no-]rerere-auto
u
pdate
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonatha
n
Nieder
mer
g
e
script: no
t
i
c
e @{-1} shorthand
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
merge
s
cript: handle --no-ff --no
-
commit co
r
rectly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonatha
n
Nieder
merg
e
scr
i
pt: --f
f
-on
l
y to disallow
t
r
ue
m
erge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jon
a
than Nieder
m
e
rge s
c
rip
t
: handle many-way octopus
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jona
t
h
a
n
Nieder
merge scri
p
t: ha
n
dle -m
--log correc
t
ly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan N
i
e
der
merge
s
cript: forbid merge -s
i
ndex
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonat
h
an Nieder
merge script: allow custom strategies
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
J
onath
a
n Nieder
merge sc
r
ip
t
:
merge -
X
<opt
i
on>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan
N
ieder
merge script: improve log mes
s
age sub
j
e
c
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Ni
e
de
r
me
r
g
e
script:
r
efuse t
o
merge during merge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
J
o
n
athan Ni
e
der
merge script: tweak unmerg
e
d
files me
s
sage
t
o m
a
tch
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonat
h
an Ni
e
der
m
e
rge script
:
--squash
,
-
-
ff
f
r
om unborn branc
h
are
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
J
o
nat
h
a
n Nieder
fmt-me
r
ge-msg
-
m
t
o
overrid
e
merge title
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jona
t
ha
n
Nied
e
r
merge-base -
-
ind
e
penden
t
to print reduced par
e
nt list
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jona
t
h
a
n
Nieder
merge-base --octop
u
s to mimic show-branch
-
-merge-base
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jo
n
a
than
N
ieder
Documentation: add
a
SEE ALSO
s
e
c
tion for mer
g
e-base
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
t6200 (fmt-me
r
g
e-msg): style ni
t
pic
k
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
J
onathan Nieder
t6010 (m
e
rge-base): modernize style
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jona
t
han N
i
eder
t7600 (merge
)
:
test merge
from b
r
anch yet to be born
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jo
n
athan Nieder
t7600 (merge): check reflog entry
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
J
o
na
t
han Nieder
t7
6
00 (merge): do not launch git
k
fo
r
--debug
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonat
h
an Nieder
t7600 (
m
er
g
e): modernize s
t
y
l
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
merge: do not mistake (a
n
cestor of) tag for b
r
anch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-21
Ju
n
io C Hamano
Git
1
.
7
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-21
Ju
n
i
o C Hamano
tests: corre
c
t
"does reflog exist
?
" tests
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-21
Brandon
Casey
t/: work around on
e
-
s
hot vari
a
ble assignment w
i
th
t
e
s
t
_
m
ust_fail
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-21
Jonathan Nied
e
r
t/R
E
AD
M
E: co
r
rect an
except
i
o
n wh
e
n breakin
g
a
&
&
c
h
ain
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
Brandon Casey
t/{t5541,lib-httpd}: rep
l
ac
e
problematic
'!()' nota
t
ion
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
Brandon Casey
t/
t
3700: co
n
v
er
t
two uses of negat
i
o
n
op
e
rator '!'
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
Junio C Hamano
Mer
g
e br
a
n
ch 'maint'
commit
|
commitdiff
|
tree
2010-07-20
Brandon Case
y
t/README: cl
a
rify test_must_fail d
e
sc
r
ipti
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
Greg Brockma
n
Check si
z
e of
p
ath bu
f
fer be
f
or
e
writing into it
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Junio C
Hamano
Merg
e
b
r
an
c
h 'm
a
int'
commit
|
commitdiff
|
tree
2010-07-19
R
alf Th
i
elow
up
d
a
t
e
-serv
e
r-info: Shorten read_pack_info_file()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Ævar Arnfj
ö
r
ð Bjarm
a
son
git
a
dd: Add --ignore-missing to SYN
O
PSIS
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Ævar Arnfjö
r
ð B
j
armas
o
n
git submodule add: R
e
move old do
c
s a
b
out implici
t
-f
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Jens Leh
m
an
n
git subm
o
dul
e
add:
Require the new --forc
e
op
t
ion
t
o
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Junio C Ha
m
ano
Merge branc
h
'jl/add-n-ig
n
or
e
-
missing'
commit
|
commitdiff
|
tree
2010-07-19
David Aguilar
Docum
e
ntation: Ex
p
lain git-merget
o
o
l's use o
f
temporary
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-16
Ju
n
i
o
C Hamano
Merge
b
ranch 'jc/dif
f
-
m
erge-b
a
se
-
multi'
commit
|
commitdiff
|
tree
2010-07-16
T
h
omas Rast
Only run aggregate-results over actual cou
n
ts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-16
Jonath
a
n Nieder
A
d
d a sample user f
o
r the svndum
p
libra
r
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-16
Junio C Hamano
diff A
.
.
.
B
: do n
o
t lim
i
t the syntax
too
n
arrowly
commit
|
commitdiff
|
tree
2010-07-15
Junio C
Ha
m
ano
Me
r
ge b
r
a
n
ch 'jn/paginate-
f
i
x
'
commit
|
commitdiff
|
tree
2010-07-15
Junio C
H
aman
o
Merge bran
c
h
'
wp/merge-tree
-
fix'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merge bran
c
h 'js/merge-rr-fix'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merge branch 'jc/diff-me
r
g
e
-
base-multi'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
M
e
rge br
a
n
ch
'
ns/merge-recursive-uptodat
e
'
commit
|
commitdiff
|
tree
2010-07-15
Junio C
H
am
a
n
o
Merge bran
c
h 'jn
/
tests'
commit
|
commitdiff
|
tree
2010-07-15
Junio
C Hamano
M
e
rge b
r
anc
h
'eb/doc-log-man
p
age'
commit
|
commitdiff
|
tree
2010-07-15
Junio C H
a
mano
Merge
b
ranch 'jn/grep-open'
commit
|
commitdiff
|
tree
2010-07-15
Jun
i
o C
H
amano
Me
r
ge
b
r
anch
'
mg/
r
ev
i
sion-doc'
commit
|
commitdiff
|
tree
2010-07-15
Ju
n
io C Hamano
Merge branc
h
'jk/mai
n
t
-
sta
t
us-keep-index-tim
e
stamp'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hama
n
o
Merge b
r
a
nch 'jc/rebase-i
-
commit-ms
g
-fix'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Mer
g
e bra
n
ch 'a
b
/su
b
module-add-f'
commit
|
commitdiff
|
tree
2010-07-15
Junio
C
Haman
o
M
e
rge branch 'bc/maint-m
a
ke
f
ile-fixes'
commit
|
commitdiff
|
tree
2010-07-15
Jun
i
o C H
a
mano
Merge branch 'mai
n
t
'
commit
|
commitdiff
|
tree
2010-07-15
Jonathan Nieder
Doc
u
ment
a
tion: add
s
u
bm
o
dule
.
*
t
o
t
he big conf
i
guration
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-15
Jonath
a
n Nieder
g
itm
o
dules
.
5: u
r
l ca
n
be
a relat
i
ve pa
t
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-15
P
avan Kumar Su
n
k
ar
a
gitweb
:
fix esc_u
r
l
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
Jonatha
n
Ni
e
der
git --pagina
t
e: paginate e
x
ternal commands aga
i
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
Jay
So
f
fia
n
MERG
E
_RR is in
.
git,
n
ot
.
gi
t
/rr-cac
h
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
Will
P
alm
e
r
merg
e
-tree: fix where two br
a
nches share no
c
hanges
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
Will
P
almer
add
basic tests for
merg
e
-tree
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
Junio C Hamano
Merge
branch 'jc/read-tree-cache
-
tree-fix'
commit
|
commitdiff
|
tree
2010-07-14
Raja R Harinath
U
s
e
dev_t for de
v
ice id
(
st_dev) from stat
i
n setu
p
_git_di
r
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-13
J
unio C Hama
n
o
di
f
f A
.
.
.
B: give one possibl
e
diff when
there a
r
e
more
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-13
Junio
C
Hamano
M
erge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2010-07-13
Oren Held
git fetch
do
c
umentation: describe short '-p
'
synonym
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-13
Miklos V
a
jna
fo
r
mat-patch: docume
n
t the f
o
rmat
.
to configuratio
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-12
Jens Lehm
a
nn
git add: Add the "--ignore-miss
i
ng" optio
n
for th
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-12
Michael
J
G
ruber
test
-
l
i
b:
TAP
compliance f
o
r skippin
g
tests on request
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-12
Michael J Gruber
tes
t
-
lib:
s
implify
GIT
_
SKIP_TES
T
S loop
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-12
Ju
n
io C Hamano
Merge branch 'ma
i
n
t
'
commit
|
commitdiff
|
tree
2010-07-12
Jon
a
than
N
ieder
t30
0
0
(ls-files
-o): modernize style
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-10
Fredrik Skolm
l
i
Documenta
t
ion: Spelling fix in protoc
o
l-capabilities
.
tx
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
Nicol
a
s Sebrecht
mer
g
e-recursive: use "up-to
-
date" instead
of "uptodate
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
Nicola
s
Sebrech
t
checko
u
t: accor
d
d
o
cumentati
o
n
t
o
what g
i
t
d
oe
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
Johan
n
e
s
Sixt
t
0
0
0
5: work around st
r
ange
$
?
i
n
k
sh wh
e
n pro
g
ram terminated
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
J
u
ni
o
C Hamano
M
e
rge
r
emote branc
h
'ko/mas
t
er'
i
nto jc/
r
ead-tree-cache
.
.
.
commit
|
commitdiff
|
tree
2010-07-09
B
o
Yang
di
f
f
.
c: fix a graph o
u
tpu
t
bug
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
Ævar Arnfjö
r
ð Bj
a
rmason
tests: Use sk
i
p
_all=* to
s
kip tests
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
Junio C Hamano
Fix "read-tr
e
e -m A B" priming
t
he cache-t
r
e
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
Eli Barzilay
R
eorg
a
nize `git-log'
m
an page
t
o clarif
y
common
d
iff
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Nazri Ramliy
grep -O: Do not pass co
l
or sequences as filen
a
mes
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
-
r
c2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
J
u
n
i
o
C
Hamano
Merg
e
branch 'ab/
t
ap'
commit
|
commitdiff
|
tree
2010-07-07
J
unio
C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-07-07
Junio C
Hamano
bac
k
merge 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
H
amano
M
e
rge branc
h
'
maint-1
.
6
.
4' into
m
ain
t
commit
|
commitdiff
|
tree
2010-07-07
Uwe Kl
e
i
n
e-König
rev-
p
arse: f
i
x
--p
a
rse-opt --ke
e
p-dash
d
ash --stop-at
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-07
Jun
i
o
C
Hamano
Merge branch 'mg/doc-rev-p
a
rse-treepat
h
-
sy
n
tax' into
.
.
.
commit
|
commitdiff
|
tree
2010-07-07
Junio C Hamano
Merge branch
'
tr/re
c
eiv
e
-
p
ack-a
l
i
a
sed-
u
pdate-fix' into
.
.
.
commit
|
commitdiff
|
tree
next