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
Merge branch 'maint' to sync with Git 1.7.3.3
2010-12-03
J
on
a
t
h
an N
i
eder
Documenta
t
ion: do not misin
t
erpret pull refsp
e
c as
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-12-01
Jonathan Ni
e
der
add: introduce
add
.
ignoreerrors synonym for a
d
d
.
ig
n
ore
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-11-15
Jonathan N
i
eder
Descr
i
be v
a
riou
s
fo
r
ms of
"be quiet" using OPT__QUIET
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-11-10
Jonathan
Nieder
cherry-pick/reve
r
t: tr
a
nsparently refresh in
d
ex
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-11-10
Jona
t
han Nieder
app
l
y:
h
andle
p
atches with fun
n
y
fil
e
name and colon
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-11-09
Jonath
a
n
N
i
e
der
t412
4
(apply --whitespace): use t
e
s
t
_might
_
f
a
i
l
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-11-09
Jonath
a
n Nieder
t
3404 (rebase
-
i)
:
intr
o
duce
h
e
lp
e
r
t
o
check position
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-11-09
Jonathan Nieder
t3404 (rebase -i): move co
m
m
e
n
t
to des
c
ription
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-11-09
Jon
a
t
h
an Nieder
t
3404 (re
b
a
s
e
-i): unroll
t
est_co
m
mit loops
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-11-09
Jonathan Nie
d
er
t3301 (notes): use tes
t
_expect_code for clar
i
t
y
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-11-09
Jonathan Ni
e
der
t1400 (up
d
a
t
e-r
e
f): use
te
s
t_must_
f
ail
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-11-09
Jonathan Nied
e
r
t1502 (
r
ev-parse --parseopt
)
:
tes
t
exit code from "-h"
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-11-09
Jonathan Nieder
t602
2
(renaming merge): chain
t
est c
o
mmand
s
with &&
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-11-09
J
o
n
a
than Nieder
test-
l
ib:
introduce te
s
t_line_count t
o
measure files
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-11-09
Jon
a
tha
n
N
ieder
tests: add missing &&
,
batch 2
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-11-09
Jonathan
N
ieder
tests: add miss
i
ng
&
&
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-11-09
Jonat
h
an
N
ied
e
r
Documentation:
documen
t
show -s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-11-03
Jonathan Nieder
user-
m
anual: remote-track
i
ng can be checked o
u
t
,
with
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-10-20
J
o
nathan Nieder
fast-
i
mport:
do not cl
e
a
r
n
otes in do_
c
h
ange_note_fa
n
out()
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-10-20
Jona
t
h
a
n N
i
e
der
t
93
0
0 (fast-i
m
port): anot
h
er test for the "replace
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-10-18
Jonatha
n
Ni
e
der
fa
s
t-imp
o
rt: tig
h
t
en
M
0
4
00
0
0
s
yntax
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-10-18
J
o
nath
a
n
N
ieder
fast-import: filemodify a
f
ter
M
040000 <tree> "
"
cra
s
hes
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-10-18
Jonathan Nie
d
er
test_terminal: ensure redirec
t
io
n
s
work reliably
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-10-18
Jonathan
N
i
eder
test_termina
l
:
c
a
t
ch use without TTY prerequ
i
sit
e
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-10-18
Jona
t
ha
n
Nieder
test-lib: all
o
w test code t
o
c
h
eck the
l
ist of
d
eclare
d
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-10-18
Jonathan Nieder
send-pack
:
avoi
d
red
u
ndant
"pack-obje
c
ts died wi
t
h
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-10-18
Jonathan Nied
e
r
t4203
(
mailma
p
): stop hardc
o
ding commit i
d
s
an
d
d
a
tes
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-10-14
Jonathan N
i
eder
Do
c
umentatio
n
: update implicit "--
n
o-index"
b
ehavior
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-10-14
Jon
a
than Nieder
D
o
cumentation: ex
p
and 'git diff' SEE ALS
O
section
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-10-14
Jonathan Nieder
Documentation
:
diff can compare blob
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-10-14
Jo
n
athan
N
ieder
Do
c
umentation:
gitrevisions is in
section 7
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-10-08
Jonathan Nieder
D
ocumen
t
ation: No argum
e
nt of ALLOC_GRO
W
should have
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-10-07
Jonathan Nieder
c
o
mmit-tre
e
: free comm
i
t me
s
sage before exitin
g
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Jonathan
Nieder
xdi
f
f: cast arg
u
ments for ctype
func
t
ions
t
o
unsign
e
d
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Jonath
a
n Niede
r
init:
p
lug t
i
ny one
-
time memory leak
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-10-03
Jon
a
t
h
an Nie
d
er
se
t
u
p:
make sure git dir p
a
th is
in
a
p
ermanent buffe
r
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-10-03
Jonatha
n
Nieder
e
nv
i
ronment
.
c: remove unus
e
d variable
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Jonathan Nie
d
er
t0004 (unwritable f
i
les): simplif
y
error handling
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-09-09
Jon
a
than Nieder
t
2016 (checkout -p): add missing &&
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-09-09
Jonathan Nieder
t1302 (core
.
reposit
o
ryversion
)
: style twe
a
ks
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-09-09
Jonathan Nieder
t2105 (
g
itfile):
a
dd missing &&
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-09-09
Jonathan Nieder
t1450 (
f
sck): remove da
n
glin
g
o
b
jects
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-09-09
Jonathan N
i
eder
tests
:
subshell indentation
stylefi
x
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-31
Jo
n
athan Nieder
te
s
ts:
si
m
plify "miss
i
ng PREREQ" message
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-31
Jon
a
than Nie
d
er
tests: mak
e
tes
t
_might_fail fa
i
l on
mis
s
ing commands
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-31
Jonathan Nieder
test
s
: make
test_m
i
g
h
t
_
f
ail more verbose
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-26
Jonathan
Nied
e
r
ll-m
e
r
ge: replace flag argumen
t
wi
t
h
options struct
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-26
Jo
n
a
t
han Ni
e
der
merge-re
c
urs
i
ve: expose merge opt
i
ons for bui
l
tin merge
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-24
Jo
n
athan Nieder
parse-options: clarify PARSE_O
P
T_NOARG d
e
script
i
on
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-24
J
o
nathan Nieder
t3302
(notes
)
:
Port
to Solaris
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-24
Jonathan Nieder
do n
o
t pass "git -c f
o
o
=
bar" pa
r
ams to tra
n
sport h
e
l
pers
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-22
Jonathan Nied
e
r
apply: handle
t
r
aditional patc
h
es
w
ith s
p
ace in fil
e
name
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-22
Jonath
a
n Nied
e
r
tests: exercise "git apply" with w
e
ird filenames
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-22
Jonath
a
n Nieder
a
p
ply: spl
i
t quoted f
i
lename handling
into new func
t
ion
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-20
Jonathan Nieder
D
o
cum
e
ntation: remove stray backslash in show
-
branch
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-20
Jonat
h
a
n
Nieder
Doc
u
me
n
tatio
n
: rem
o
ve str
a
y backsla
s
h
es
f
rom "Fight
i
n
g
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-20
J
o
n
athan Nie
d
er
Documentation: do
n
o
t c
o
nvert
.
.
.
oper
a
tor to
e
l
lips
e
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-20
Jon
a
t
han Nieder
Doc
u
mentation:
a
voi
d
stray b
a
c
kslash in user ma
n
u
al
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-20
Jonathan Nieder
Documentation
:
avoid str
a
y b
a
ckslashes i
n
core tutorial
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-20
Jon
a
than Ni
e
d
er
Documentation: remo
v
e stray ba
c
kslas
h
e
s in rev-parse
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-20
J
onathan Nieder
Docu
m
entat
i
on: remove back
s
la
s
h
before
~ in
f
a
st-im
p
ort
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-20
Jonathan Ni
e
der
Do
c
umentatio
n
: re
m
ove st
r
ay backslash f
r
om "gi
t
bund
l
e
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-20
Jonathan Nieder
Documentation/technica
l
: avoid
s
t
r
ay backsla
s
h in parse
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-20
J
o
nathan Nieder
Docu
m
entati
o
n: remove backs
l
ashe
s
in m
a
npage synops
e
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-20
J
onathan
Nieder
Docu
m
ent
a
tion: cla
r
ify
q
u
o
ting i
n
git
i
gnore
doc
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-20
Jon
a
than Nieder
D
o
cum
e
ntation: clarify quoting in "git
rm" example
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-20
Jonath
a
n N
i
eder
Documentation: add m
i
ss
i
ng
quot
e
s
to "git gr
e
p" e
x
amples
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-20
Jonathan Nie
d
e
r
D
ocumentation: cl
a
ri
f
y
q
u
o
ting in "git a
d
d" example
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-20
J
o
n
athan Nieder
D
o
cumentati
o
n: unb
r
eak regex in show-re
f
manual
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-20
J
o
na
t
ha
n
Nieder
Docum
e
ntation: quot
i
n
g
tr
o
u
ble in
"git
rm" discussion
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-20
J
o
n
a
than Ni
e
der
Document
a
tion: tweak descript
i
on of log
.
date
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-20
Jonathan Niede
r
D
o
cumenta
t
io
n
:
set a !DOCTYPE fo
r
u
ser manua
l
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-19
Jonathan Nie
d
e
r
a
utoconf: don'
t
use platform r
e
gex if it l
a
ck
s
REG_STARTEND
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
J
o
n
ath
a
n N
i
e
der
merge script: lea
r
n
--[no
-
]rerere-au
t
oupdate
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nied
e
r
merge script: notice @{-1}
shorthand
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
J
onathan Nieder
merge script: handle
-
-no-f
f
--no-commit correctl
y
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonath
a
n Nieder
merge script: -
-
ff
-
only to dis
a
llow
true merge
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
merge script: handle
m
any-way octop
u
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Ni
e
der
mer
g
e s
c
ript: handle -m --
l
og c
o
rrectly
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
J
onath
a
n Nieder
m
e
rg
e
s
c
ript:
fo
r
b
i
d merge
-s index
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
J
onath
a
n Nieder
merge script
:
all
o
w
c
ustom st
r
ategies
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jon
a
than Niede
r
merge scr
i
p
t
: merge -X<
o
p
t
ion>
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jo
n
athan Nied
e
r
m
erge script: improve log
m
essage subject
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
J
o
n
a
t
han Ni
e
der
merge
s
c
r
ipt: refuse
t
o
merge during merg
e
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan N
i
eder
merge scr
i
pt
:
twe
a
k unmerged files
m
es
s
age to m
a
t
c
h
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonath
a
n
Nieder
merge script: -
-
squash, --ff from
unborn branch ar
e
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
J
o
na
t
h
a
n Nieder
fmt-merge-msg -m
t
o ov
e
rride merge
title
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Ni
e
der
merge-base --independent
t
o print
reduced par
e
nt l
i
s
t
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
J
o
nath
a
n Nieder
me
r
g
e-base --octopus
to mimic
s
how-branch
--mer
g
e-base
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonath
a
n
N
ieder
Documentatio
n
: add a SEE
A
LSO section for merge-base
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan
N
ieder
t6200
(
f
m
t-merge-msg)
:
sty
l
e nitpicks
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
t6010 (merge
-
base): m
o
dernize style
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
t76
0
0 (merge): test merge
f
ro
m
branc
h
y
et to be born
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Ni
e
d
e
r
t7600
(
merge):
c
heck reflog entry
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonath
a
n
N
ieder
t76
0
0 (me
r
ge
)
:
d
o not launch gi
t
k
f
or --debug
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan N
i
eder
t760
0
(mer
g
e): modernize s
t
yle
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan
N
ied
e
r
merg
e
: do not
mis
t
ake (anc
e
st
o
r of) ta
g
for branch
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-16
Jona
t
han
Nieder
t7006 (pager): add missin
g
T
T
Y prerequisites
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-16
J
o
nathan Ni
e
der
m
e
r
ge: let cu
s
tom strategies intervene in trivial merges
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-16
Jonathan
N
ieder
t7606 (merge-
t
hei
r
s):
m
od
e
rnize style
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
next