repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
merge: Make 'merge.log' an integer or boolean option
2010-09-09
R
a
mkumar Ramachandra
merge: Ma
k
e
'merge
.
l
og' an integer or
b
oolean
o
pt
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-09
Ramkumar Ramachandra
merge:
M
ake
'--log' an intege
r
option for number
o
f
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-09
Ramkumar Ramachandra
fmt_
m
erge_msg: Change fmt_merge_msg API to a
c
cept shortlog_len
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jona
t
ha
n
N
i
eder
merg
e
sc
r
ipt: l
e
a
rn -
-
[
no-]rerer
e
-autoupd
a
te
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonatha
n
N
ieder
merge
script: n
o
ti
c
e @{-1
}
shorthand
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jo
n
athan Nieder
merge script:
hand
l
e --no-ff --no-co
m
m
i
t cor
r
ectl
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jon
a
t
h
a
n
Nied
e
r
merg
e
s
cri
p
t:
--ff-only to disa
l
l
ow true me
r
ge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
J
onathan
N
ie
d
er
merge scri
p
t: h
a
n
dle
many-way octo
p
us
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan
N
ieder
me
r
g
e script: han
d
le -
m
-
-log co
r
rectly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan
Nieder
merge script: forbid merge -s i
n
dex
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
merg
e
script: allow custom strategies
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonath
a
n
N
i
eder
m
erge s
c
rip
t
: merge -X<opt
i
on>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
J
o
nathan Nieder
merge scri
p
t: im
p
ro
v
e
lo
g
mes
s
age subject
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
J
o
na
t
han Ni
e
de
r
m
erge
s
cri
p
t:
r
efus
e
to merge d
u
r
i
ng merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jon
a
than Nied
e
r
m
e
rge sc
r
i
p
t
: tweak un
m
erged fil
e
s message to match
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nied
e
r
m
erge sc
r
ipt: --squas
h
, --
f
f from unb
o
rn branch
a
re
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan N
i
eder
fmt-
m
erge-msg -m
to ov
e
rrid
e
merge t
i
tle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jona
t
han Ni
e
der
mer
g
e
-
base -
-
i
ndep
e
nden
t
t
o
print reduced pare
n
t
l
is
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonat
h
a
n
Nieder
merge-ba
s
e --oct
o
p
u
s to mimic show-branch --mer
g
e-base
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonath
a
n Niede
r
D
o
c
umentation: add a SEE ALSO s
e
ction
f
o
r merge-base
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
t6200
(f
m
t-mer
g
e
-
m
sg): style
n
itpi
c
k
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
J
onathan N
i
eder
t60
1
0 (merge-ba
s
e): modernize s
t
yle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
t7600 (me
r
ge): test merge from branch
y
et
to be born
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
t7600
(merge): check reflog
e
n
tr
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Ni
e
der
t7600
(m
e
rge
)
: do not l
a
u
n
ch gitk fo
r
--debug
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
t7600 (m
e
rge)
:
modernize style
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jo
n
athan Nieder
merge: do n
o
t mi
s
take (ancestor of
)
t
ag f
o
r
branch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-21
Junio C
H
amano
G
it 1
.
7
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-21
Junio C H
a
ma
n
o
tests: c
o
r
rect "does re
f
log
ex
i
st?
"
t
e
sts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-21
B
randon Case
y
t
/: wor
k
around
one-shot vari
a
ble ass
i
gnment with te
s
t_must_fail
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-21
Jonathan
N
ieder
t/
R
EAD
M
E: correct an e
x
ception when bre
a
ki
n
g a && ch
a
in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-20
Bra
n
d
o
n Case
y
t/{t5
5
41,lib-httpd}: replace problema
t
ic '!()' no
t
ation
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-20
Brand
o
n
Casey
t/t3700
:
convert two uses of neg
a
t
i
on
o
perator '!'
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-20
Junio C Hamano
Mer
g
e
b
ranch 'mai
n
t'
commit
|
commitdiff
|
tree
2010-07-20
Brandon
C
as
e
y
t/README:
clarify tes
t
_
m
ust_fail de
s
cr
i
ption
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-20
Greg Brockman
Ch
e
ck size of path b
u
f
f
er b
e
f
o
re writing into it
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Ju
n
i
o
C Ha
m
ano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-07-19
Ralf Thiel
o
w
update-server-in
f
o:
Shorten read_pack_in
f
o_f
i
le()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Ævar Arnfjör
ð
B
jarmason
g
it add: Add --ignore-miss
i
ng to SYNOPS
I
S
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Æ
v
a
r
A
r
n
fjörð Bjarmason
git submodu
l
e add: R
e
m
o
ve old docs abou
t
i
m
plicit
-
f
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Jens Lehm
a
nn
git submodule a
d
d: Require the n
e
w --force
o
ption to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Junio C Hamano
M
e
rge branch
'jl/add-n-ig
n
ore-mis
s
ing'
commit
|
commitdiff
|
tree
2010-07-19
D
a
vid Ag
u
i
l
a
r
Documenta
t
ion
:
E
xplai
n
gi
t
-mergetool's us
e
of temporary
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-16
Junio C
Hamano
Mer
g
e branch 'jc/diff-merge-base-multi'
commit
|
commitdiff
|
tree
2010-07-16
Tho
m
as Rast
Only run aggregate-results over actua
l
counts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-16
Jo
n
athan Nie
d
er
Add a
s
am
p
le user f
o
r
the s
v
ndump
library
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-16
Ju
n
io
C
H
amano
diff A
.
.
.
B: do not li
m
it the syntax too narrowly
commit
|
commitdiff
|
tree
2010-07-15
Junio
C
Ha
m
ano
Merge
branch 'jn/paginat
e
-fix'
commit
|
commitdiff
|
tree
2010-07-15
Junio C
Hamano
Merge branch
'
w
p/merge-tree-fix'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Ha
m
ano
M
e
rge br
a
nc
h
'js/merg
e
-rr-fix'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
M
erge br
a
nc
h
'
j
c
/
diff
-
merg
e
-base-mult
i
'
commit
|
commitdiff
|
tree
2010-07-15
Junio C
Ham
a
n
o
Merge
b
ranch 'ns/m
e
rge-recursive-upt
o
date'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Haman
o
Merge
branch 'jn/tests
'
commit
|
commitdiff
|
tree
2010-07-15
Junio C
H
amano
Merge bran
c
h 'e
b
/
d
oc-l
o
g-m
a
n
p
ag
e
'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merge bra
n
ch 'jn/grep-open'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merge
bran
c
h 'm
g
/revision-doc'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Ham
a
no
Mer
g
e b
r
anch 'jk/maint-s
t
atu
s
-keep-index-timest
a
m
p
'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hama
n
o
Merg
e
b
r
an
c
h 'jc/rebase-i-com
m
it-msg-fix'
commit
|
commitdiff
|
tree
2010-07-15
Juni
o
C Hamano
M
erge branch 'ab/submodule-add-f
'
commit
|
commitdiff
|
tree
2010-07-15
Junio
C H
a
mano
Mer
g
e branch
'bc/ma
i
nt-ma
k
efile-fixe
s
'
commit
|
commitdiff
|
tree
2010-07-15
Juni
o
C Ham
a
no
Merge branch 'maint
'
commit
|
commitdiff
|
tree
2010-07-15
Jonathan Nieder
Documentation: add
s
u
bmo
d
ule
.
* to the big con
f
iguration
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-15
Jona
t
han
N
ieder
gitmodules
.
5:
u
r
l
c
a
n
be a
r
ela
t
ive p
a
th
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-15
Pav
a
n Kumar Sunkara
gitweb: fix esc_url
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
Jonathan Nieder
git -
-
pagin
a
te
:
pagi
n
ate external commands again
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
Jay Soffian
M
E
R
GE
_
RR is
in
.
git, not
.
git/
r
r-cache
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
Will Palmer
merge-tree: fix wher
e
two
b
ranches share no changes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
W
i
ll Palmer
add basic tests f
o
r mer
g
e-tree
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
Junio C Hamano
Gi
t
1
.
7
.
2-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
Junio C Hamano
Merge branch
'j
c
/read-
t
ree-cac
h
e-tree-fix'
commit
|
commitdiff
|
tree
2010-07-14
Raja R Harinath
U
se dev
_
t
f
or device id (st_dev) from stat i
n
setup_git
_
dire
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-13
Junio C Hamano
diff A
.
.
.
B: give one possible diff
w
hen there are m
o
r
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-13
Junio C
H
amano
Merge branc
h
'm
a
int'
commit
|
commitdiff
|
tree
2010-07-13
Oren Held
git fetch
documentat
i
on: de
s
cribe s
h
or
t
'
-
p
'
synonym
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-13
Miklos Vajna
format-patch: d
o
cument
t
he format
.
t
o configuration
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-12
J
e
ns
Leh
m
ann
git add: Add
the "--i
g
nore-missing" option for the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-12
M
i
chael J Grub
e
r
test-lib: T
A
P com
p
l
i
ance for
s
ki
p
ping tests on re
q
uest
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-12
Michael J Gruber
test-
l
ib: sim
p
l
i
fy
G
IT_SKIP_TESTS loop
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-12
Junio C Hamano
Mer
g
e branc
h
'maint'
commit
|
commitdiff
|
tree
2010-07-12
Jonat
h
an Nieder
t
3000 (ls-files -o): moderniz
e
s
ty
l
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-10
Fre
d
rik S
k
o
l
ml
i
Documentat
i
o
n
: Sp
e
l
l
ing fix
i
n protoc
o
l-capabil
i
ties
.
txt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Nicolas
S
ebrecht
merge-recursive
:
use
"
up-t
o
-date" instead of "up
t
odat
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Nicol
a
s
S
ebrecht
checkout: a
c
cord
documentation to wh
a
t git d
o
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Johannes
Si
x
t
t0005:
w
ork ar
o
und strange
$? in ksh
w
hen
p
rogram termi
n
ated
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Junio C Haman
o
Merge remote
b
ranch 'ko/master' into jc/r
e
ad-tr
e
e-c
a
c
h
e
.
.
.
commit
|
commitdiff
|
tree
2010-07-09
B
o Y
a
ng
diff
.
c
:
fix
a graph output bug
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Æv
a
r A
r
n
fj
ö
rð Bjarmason
tests: Us
e
skip_all
=
* to s
k
ip tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Junio C Hamano
Fix "read-tree -
m
A B"
p
riming t
h
e cache-tree
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
E
li Barzilay
R
eorganize `
g
it-log' man page to
c
larify comm
o
n
diff
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Na
z
ri Ramliy
grep -O: Do not pass
color sequences as
filenames 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
M
e
rge branch 'ab/tap
'
commit
|
commitdiff
|
tree
2010-07-07
J
u
n
io C Hamano
Merg
e
b
r
an
c
h 'mai
n
t'
commit
|
commitdiff
|
tree
2010-07-07
Junio C Haman
o
backme
r
ge a f
e
w more fixes to 1
.
7
.
1
.
X
series
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Juni
o
C Hamano
Me
r
ge
bra
n
ch 'ma
i
nt-1
.
6
.
4' into maint
commit
|
commitdiff
|
tree
2010-07-07
Uwe Kle
i
ne-
K
önig
rev-pa
r
se:
f
ix --p
a
r
se-opt --keep-dashdash
-
-
s
top-
a
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
J
unio C Hamano
Merge
branch 'mg/d
o
c-r
e
v
-parse-tree
p
ath-synt
a
x' into
.
.
.
commit
|
commitdiff
|
tree
2010-07-07
J
u
nio C Hamano
M
erge branc
h
'tr/rece
i
ve
-
pack-ali
a
sed-
u
p
date-fi
x
' int
o
.
.
.
commit
|
commitdiff
|
tree
2010-07-07
Pierre Habou
z
it
fix git
b
ranch -m i
n
pres
e
nce of c
r
oss devices
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Brand
o
n Casey
t/t0006: spe
c
ify tim
e
zone
a
s
E
ST5 no
t
EST t
o
comply
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next