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
t6200-fmt-merge-msg: Exercise 'merge.log' to configure shortlog length
2010-09-09
Ramkumar
Ramac
h
andra
t
6
200-f
m
t
-merge-m
s
g: Exer
c
ise 'merge
.
log
'
to confi
g
u
r
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-09
Ramkumar
R
amachandra
merge: Make 'merge
.
lo
g
' an integer or bool
e
an opt
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-09
Ramkumar Ra
m
achandra
merge:
M
ake '--log'
a
n integer option for num
b
er of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-09
R
a
mkumar Ram
a
c
h
andra
fmt_merge_msg: Change
f
mt_merge_msg API to
a
ccept shortl
o
g_len
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
m
er
g
e script
:
lea
r
n
-
-[no-]
r
erere-autoup
d
ate
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonath
a
n Nieder
merge script: notice @{-1} shorthand
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nie
d
er
m
erg
e
script: handle
-
-no-ff
-
-no-co
m
mit c
o
rrec
t
ly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Ni
e
der
m
e
rge sc
r
ipt
:
--ff-only to
d
isallow tru
e
merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan
N
ieder
m
erge sc
r
i
p
t: handle many-
w
ay octopus
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
J
o
nathan Nieder
merge
s
crip
t
: hand
l
e -
m
--log correctly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonatha
n
Nied
e
r
merge s
c
ript: forbid merge -
s
in
d
e
x
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonath
a
n Nieder
mer
g
e
s
c
ript: allow cust
o
m strategie
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonatha
n
Nieder
m
e
r
g
e sc
r
ip
t
:
m
erge
-X
<
option>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonat
h
a
n Nieder
m
er
g
e script:
i
m
prove log me
s
sage subject
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonatha
n
Nieder
merge scri
p
t
: refu
s
e to merge
d
uri
n
g merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonath
a
n Nieder
me
r
ge script: tweak un
m
erged files
messa
g
e to matc
h
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
merge script: --s
q
uash, --ff
f
rom unbor
n
bra
n
ch are
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jo
n
athan
N
ie
d
er
fmt-merge-msg -m
to override merge ti
t
le
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
J
onatha
n
Nieder
m
e
r
ge-base
-
-i
n
dependent to
prin
t
red
u
ced par
e
n
t
lis
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
J
onathan Nieder
merge-ba
s
e
-
-octopus
t
o mimic sh
o
w-b
r
anch
-
-
m
erge-base
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
D
o
cumentation: ad
d
a SEE ALSO s
e
cti
o
n for merge-base
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
t6200 (fmt-merge-msg): style n
i
tp
i
c
k
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
t6010
(m
e
rge-base): moderniz
e
style
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nie
d
er
t76
0
0 (
m
erge): t
e
st
merg
e
from
b
ranch
y
e
t
t
o be born
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
J
o
nathan Nieder
t7600 (merge): check
reflog entr
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonatha
n
Nied
e
r
t7600 (merge)
:
d
o
not launch 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 Nie
d
er
m
erge: do not mi
s
take (ance
s
to
r
of) tag
for bra
n
c
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-21
J
u
n
i
o C Hama
n
o
Git 1
.
7
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-21
Junio C Haman
o
tests: cor
r
e
ct "d
o
es
refl
o
g
exi
s
t?
"
t
e
s
ts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-21
Br
a
ndon Casey
t/: work around one-shot variable assig
n
ment
w
ith tes
t
_
m
ust_fail
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-21
Jon
a
than Nieder
t
/
READM
E
: correct
an
exc
e
ptio
n
when bre
a
king
a && chain
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-20
Brandon C
a
sey
t/{t55
4
1,lib-http
d
}: re
p
l
a
c
e prob
l
e
matic
'!()' notation
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-20
Brandon Casey
t/t3700:
c
o
nvert
t
wo uses of
n
ega
t
ion operato
r
'
!'
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-20
Jun
i
o C Ham
a
n
o
Merge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2010-07-20
Brandon Casey
t/README:
c
la
r
ify
test
_
must_
f
ail
de
s
criptio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-20
G
reg Bro
c
kman
Check s
i
z
e
of path buffe
r
b
e
for
e
w
r
iting into it
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Junio C Ha
m
ano
Merge bran
c
h 'ma
i
n
t'
commit
|
commitdiff
|
tree
2010-07-19
Ralf Thielow
update-server-
i
nfo:
Shorten
r
ead_pack_info_fi
l
e
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Ævar Arnfjörð
B
j
armason
git
a
dd: Add --ignore-mis
s
ing to SYNOPS
I
S
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Ævar Arnf
j
örð Bjarmason
g
i
t submo
d
ule add
:
Re
m
ove old d
o
cs 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
t
he new --force option to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Juni
o
C
H
amano
Merge branch
'
jl/a
d
d-n-ign
o
re-missing
'
commit
|
commitdiff
|
tree
2010-07-19
David
Ag
u
il
a
r
Documentation: Explain git-merget
o
ol's use of te
m
porary
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-16
Jun
i
o C Hamano
Me
r
ge bra
n
ch 'jc/diff-m
e
rge-b
a
se-mult
i
'
commit
|
commitdiff
|
tree
2010-07-16
Thomas Rast
O
nly run aggregate-re
s
ults over actual
c
o
u
n
ts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-16
Jonathan Nie
d
e
r
A
dd a sample user for
the svndump
l
ibrary
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-16
Junio C Hama
n
o
diff A
.
.
.
B: do not
limit th
e
syntax too n
a
rrowl
y
commit
|
commitdiff
|
tree
2010-07-15
Jun
i
o C Hama
n
o
M
e
rge
b
r
a
nch 'jn/paginate-fix'
commit
|
commitdiff
|
tree
2010-07-15
Junio C
H
amano
Me
r
ge branch
'
wp/merge
-
tree-f
i
x'
commit
|
commitdiff
|
tree
2010-07-15
Junio
C
Hamano
Merg
e
br
a
nch 'js/
m
e
r
g
e
-rr-fi
x
'
commit
|
commitdiff
|
tree
2010-07-15
J
u
nio C Hamano
Merge branch 'j
c
/diff-mer
g
e-base-multi'
commit
|
commitdiff
|
tree
2010-07-15
J
u
n
i
o
C Hamano
Merge branch 'ns/m
e
rge-re
c
u
r
s
i
ve-uptodate'
commit
|
commitdiff
|
tree
2010-07-15
Jun
i
o
C Ha
m
a
no
Merge branch 'j
n
/test
s
'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Ham
a
n
o
Merge br
a
nch 'eb/doc-log
-
manpage'
commit
|
commitdiff
|
tree
2010-07-15
J
unio C Hamano
Merge
bran
c
h 'j
n
/grep-op
e
n'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merge br
a
nch 'mg
/
re
v
ision-
d
oc'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Ham
a
n
o
Merge
b
r
a
nch 'j
k
/maint-s
t
a
t
us-keep-index-timestamp
'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merge
branch 'j
c
/re
b
ase-i-commit-msg-fix'
commit
|
commitdiff
|
tree
2010-07-15
Jun
i
o C Hamano
Merge branch 'ab/su
b
module
-
a
dd-f'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merge
bran
c
h 'bc/maint-makefi
l
e-fixes'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merge bra
n
c
h 'maint'
commit
|
commitdiff
|
tree
2010-07-15
Jon
a
than Nieder
Documenta
t
ion: add
subm
o
dule
.
* to the big
co
n
f
i
guration
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-15
Jonathan
N
ieder
gitmodules
.
5: url can be a
relative path
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-15
P
a
van Kumar Sunkara
gitweb:
fix e
s
c_url
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
Jonathan Nieder
git --paginate: paginate external com
m
an
d
s again
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
J
ay Soffia
n
MERGE_RR is
i
n
.
git, not
.
git/rr-cache
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
W
i
ll Pa
l
m
er
merge
-
tree:
fix wher
e
two branches sh
a
re n
o
c
hange
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
W
i
ll Palmer
a
dd
b
asic tes
t
s
f
or merg
e
-tree
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
Junio C Hama
n
o
G
i
t 1
.
7
.
2
-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
Junio
C
Hamano
Merge b
r
anch 'jc/read-tree-cache-tree-fix'
commit
|
commitdiff
|
tree
2010-07-14
Raja R Hari
n
a
th
Use dev_
t
for devi
c
e i
d
(
st_de
v
) f
r
om stat in setup_git_
d
ire
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-13
Juni
o
C Ha
m
a
no
di
f
f A
.
.
.
B: give one poss
i
b
l
e
diff when
there are m
o
r
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-13
J
u
nio C Hamano
Merge branch 'main
t
'
commit
|
commitdiff
|
tree
2010-07-13
O
r
en Held
g
it fetch document
a
tion: d
e
s
c
ribe short '-p' sy
n
onym
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-13
Mikl
o
s
Vajna
f
ormat-patch: d
o
cu
m
ent t
h
e format
.
to co
n
figuration
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-12
Jens
L
ehmann
git
a
dd: Add
t
h
e "--
i
gnore-miss
i
ng" o
p
t
i
on fo
r
the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-12
Mi
c
h
a
e
l
J Gruber
test-l
i
b
:
TAP complian
c
e
f
or s
k
ipping tests o
n
request
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-12
Michael J Gruber
t
est-li
b
: simplify GIT_SK
I
P_TESTS loop
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-12
Junio C
Hamano
Merge
b
ran
c
h
'maint'
commit
|
commitdiff
|
tree
2010-07-12
Jonathan Nieder
t
3000 (ls-files -
o
): mo
d
er
n
ize 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
il
i
ties
.
tx
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Ni
c
olas Sebrech
t
merge
-
recursive: use "up-to-date" instead of "
u
ptodat
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Nicolas Sebrecht
checkou
t
: accord docu
m
entation to wh
a
t git do
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Jo
h
annes Sixt
t0
0
05: work
a
round strange
$? in ksh wh
e
n p
r
og
r
a
m
terminated
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Junio C
H
a
m
ano
Merg
e
remote branch 'ko/
m
aste
r
' into jc/read-
t
ree-cache
.
.
.
commit
|
commitdiff
|
tree
2010-07-09
Bo Ya
n
g
diff
.
c:
fix a graph outpu
t
bu
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Æva
r
Arnfjörð Bjarmason
tests: U
s
e skip_all=*
t
o ski
p
tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Junio C
H
aman
o
Fix "
r
ead-tre
e
-m A B"
p
riming the cache-tr
e
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
E
l
i Ba
r
zilay
Reorganize
`
git-log' man
p
ag
e
to clarify common dif
f
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
N
a
zri Ramliy
grep -O: Do not pass
c
olor s
e
quences as
fi
l
enames to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Junio C
H
am
a
no
G
i
t
1
.
7
.
2-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Junio C
H
amano
M
e
r
g
e bra
n
ch
'
ab/tap'
commit
|
commitdiff
|
tree
2010-07-07
Ju
n
i
o C Hamano
Me
r
g
e
branch 'maint'
commit
|
commitdiff
|
tree
2010-07-07
Junio C Hamano
backmerge a
few
m
ore f
i
xes to
1
.
7
.
1
.
X
serie
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Junio C H
a
mano
Merge bra
n
ch 'mai
n
t
-1
.
6
.
4' into maint
commit
|
commitdiff
|
tree
2010-07-07
Uwe
K
leine-König
rev-parse: fix --parse
-
op
t
--keep-
d
ashdash --
s
top
-
at
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Junio C Ha
m
ano
Merge
branch 'mg/doc-rev-parse-
t
reepath-syntax' into
.
.
.
commit
|
commitdiff
|
tree
2010-07-07
Ju
n
i
o C Hamano
Merge branch 't
r
/
receive-pack
-
aliased-update
-
f
ix' into
.
.
.
commit
|
commitdiff
|
tree
2010-07-07
Pierre H
a
bouz
i
t
fi
x
git bran
c
h
-m in prese
n
ce
of cross devices
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next