repo.or.cz
/
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 'pn/commit-autosquash'
2010-12-03
Jonathan Nieder
Documen
t
ation: do
n
o
t
m
i
s
in
t
erpret pull refspec as
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-12-01
Jo
n
athan Nied
e
r
add: introduce add
.
ignoreerrors syno
n
ym for add
.
i
gnore
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-11-15
Jonathan Niede
r
Describe various forms
o
f
"be quiet"
usin
g
O
P
T__QUIET
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-11-10
Jonathan
N
ieder
c
h
erry-pick/rev
e
r
t
: transparently refresh inde
x
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-11-10
Jon
a
than Nieder
app
l
y: hand
l
e patches w
i
th
funn
y
fi
l
ename and
c
olon
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-11-09
Jon
a
than Nied
e
r
t
4124 (apply
--whitesp
a
ce
)
:
u
se test_migh
t
_fa
i
l
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-11-09
Jonathan
N
ieder
t
3
4
0
4
(rebase
-i): introduce helper
to check posit
i
on
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-11-09
Jonathan Nieder
t3404 (rebase -i): m
o
ve comment to de
s
cr
i
ption
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-11-09
J
o
nathan N
i
e
d
er
t3404 (rebase
-
i): un
r
ol
l
t
e
st_co
m
mi
t
loops
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-11-09
Jonathan Nieder
t330
1
(notes): use test_expect_code for clarity
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-11-09
Jonathan Nieder
t1400 (update-ref): use test_must_fail
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-11-09
Jonathan Nieder
t1502 (re
v
-parse --par
s
eopt):
t
est exit code from "-h"
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-11-09
Jona
t
h
a
n Nieder
t602
2
(renaming merge
)
: chain test comm
a
nds with &&
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-11-09
Jonathan N
i
e
d
er
test-lib: introduce
test_line_c
o
unt to me
a
sure files
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-11-09
Jonat
h
an Ni
e
de
r
tests: add
m
issing
&
&
,
batch
2
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-11-09
Jonat
h
an Nie
d
er
tests: add missing &&
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-11-09
Jona
t
han
N
iede
r
Docu
m
ent
a
ti
o
n: docu
m
ent
s
how -s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-11-03
Jonathan Nieder
user-manual: remote-track
i
ng can be c
h
ecked out, with
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-10-20
Jon
a
than N
i
e
d
er
f
a
st-impor
t
: do not clear notes in do_change_no
t
e_fanout()
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-10-20
Jonathan
Nieder
t9300 (fast-i
m
port): a
n
o
ther
t
e
st for the "r
e
pla
c
e
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-10-18
Jona
t
han Nieder
fast-imp
o
rt
:
tight
e
n M 040000
s
yntax
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-10-18
Jonat
h
a
n
Nieder
f
ast-import: file
m
odify after M 040
0
00 <tr
e
e> ""
c
rashes
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-10-18
Jo
n
athan Nieder
t
es
t
_
t
erm
i
na
l
:
e
nsure redirection
s
work r
e
liably
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-10-18
Jonathan N
i
eder
test_terminal: ca
t
ch us
e
w
itho
u
t
T
TY pre
r
equi
s
i
te
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-10-18
Jo
n
a
th
a
n
Nieder
test-li
b
: allow tes
t
code to check the lis
t
of d
e
clared
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-10-18
Jonathan
N
ieder
send-pa
c
k:
a
void r
e
dunda
n
t "pac
k
-objects die
d
with
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-10-18
J
on
a
tha
n
Ni
e
der
t420
3
(mailmap): sto
p
ha
r
dcoding commit
ids an
d
dat
e
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-10-14
J
onathan
Nieder
Docu
m
entatio
n
:
update imp
l
i
cit "--no-index" behavior
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-10-14
Jo
n
athan Nied
e
r
Documentation: expand 'git di
f
f' SEE
A
L
SO
s
e
ction
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-10-14
Jon
a
than Nieder
D
ocumen
t
ation:
diff c
a
n compare blobs
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-10-14
Jonatha
n
N
ieder
Do
c
umentation: gitre
v
i
s
ions is in section 7
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-10-08
Jo
n
athan Niede
r
Docu
m
en
t
ation: N
o
argumen
t
of ALL
O
C_GROW
s
h
ould have
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-10-07
Jo
n
athan Nieder
c
omm
i
t-tree: free commit m
e
ssage bef
o
re exiting
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Jonatha
n
Nieder
xdiff: cast ar
g
uments for ctype fu
n
ctions to unsigned
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Jonathan Nieder
init
:
plug tiny one-time memory
leak
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-10-03
Jona
t
han Nieder
setup: m
a
ke sure g
i
t dir
p
ath
is in a permanent bu
f
fer
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-10-03
Jonathan
N
ieder
environment
.
c: remove unused va
r
i
a
b
l
e
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Jonathan N
i
e
d
er
t
0
004 (unwrit
a
ble files): simplify
erro
r
ha
n
dling
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-09-09
Jonathan Nieder
t2016
(
checkout -p
)
: add missing &&
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-09-09
Jonathan Nieder
t1
3
02 (co
r
e
.
re
p
osi
t
ory
v
e
rsion)
:
styl
e
tweaks
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-09-09
Jonat
h
a
n N
i
e
der
t2
1
05 (gitfile): add missing &&
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-09-09
J
onatha
n
Nieder
t14
5
0
(
f
s
ck): r
e
move danglin
g
objects
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-09-09
Jonathan
N
i
eder
tests: subshell indentat
i
on stylefix
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-31
J
onathan Nied
e
r
test
s
: simplify "missing
P
RERE
Q
"
m
essag
e
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-31
Jonathan Nieder
te
s
ts:
make
tes
t
_might_fail
f
ail on miss
i
ng commands
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-31
Jo
n
athan Nieder
test
s
: make te
s
t_might_fai
l
m
o
re verbose
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-26
Jonathan Nie
d
er
ll-mer
g
e: replace flag
a
rg
u
ment with o
p
tions struct
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-26
J
onathan Nieder
merg
e
-
r
e
c
ursive: exp
o
se merge options
f
or
builtin merg
e
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-24
Jonathan
Nied
e
r
parse-
o
ptions: cla
r
ify PARSE
_
OP
T
_NO
A
RG descript
i
on
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-24
Jo
n
athan
Niede
r
t
3
302 (
n
otes)
:
Port to Sola
r
i
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-24
Jonat
h
an Nieder
do not pass
"
git -c
f
oo=bar" p
a
rams to t
r
ansport he
l
p
e
rs
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-22
Jonat
h
an Nieder
appl
y
: handle tr
a
d
it
i
onal patches with space in filename
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-22
Jonathan
N
i
e
de
r
t
e
s
ts:
exe
r
cise "gi
t
apply"
with weird filenames
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-22
Jonathan Nieder
apply: spli
t
quote
d
filename
handlin
g
int
o
new func
t
i
on
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-20
Jonathan
Nieder
D
ocumentation: remove stray backsla
s
h in
show-bran
c
h
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-20
Jona
t
h
a
n
Nied
e
r
D
o
cumentat
i
on:
remove stray backs
l
a
shes from "Fighting
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-20
Jonatha
n
Nieder
Documentation: do not convert
.
.
.
operato
r
t
o
el
l
ip
s
e
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-20
J
o
nathan Nieder
Docum
e
ntati
o
n: avoid stra
y
b
ackslash in u
s
er m
a
nual
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-20
J
ona
t
han N
i
eder
Documentation: avo
i
d
stray ba
c
kslashes in core tutori
a
l
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-20
Jonat
h
an Nied
e
r
Documentation: remove stray
b
ackslashe
s
in rev-par
s
e
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-20
Jonathan Nieder
Document
a
tion: rem
o
v
e
back
s
lash before ~ in fast-import
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-20
Jonathan
N
i
e
der
Documentation: remove st
r
ay b
a
ckslash from "gi
t
b
u
ndle
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-20
J
onathan Nieder
Documentat
i
on/te
c
hnical: avoid stray backslash in
parse
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-20
J
onathan
N
i
ede
r
Docume
n
tati
o
n: remove backslashes in
m
a
n
p
a
ge syn
o
pses
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-20
Jo
n
at
h
an
Nieder
Docu
m
ent
a
t
i
on:
clarify quoti
n
g in gi
t
i
g
n
o
re
d
ocs
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-20
J
o
nath
a
n Nieder
Documentation:
clarify qu
o
ting i
n
"g
i
t r
m
"
example
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-20
Jona
t
ha
n
N
i
eder
Doc
u
mentation:
a
d
d mis
s
ing quo
t
es to
"git gre
p
" exam
p
les
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-20
Jo
n
a
tha
n
Nie
d
er
D
o
cumenta
t
ion:
clari
f
y
q
u
o
ting
i
n "git
a
d
d" exampl
e
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-20
Jo
n
athan Ni
e
d
er
Docum
e
nt
a
tion: unb
r
eak regex in
s
how-ref
m
a
nual
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-20
J
o
nathan Nieder
Documen
t
a
tio
n
:
q
uoting trouble
in "git rm" discussion
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-20
Jonathan N
i
e
der
Documentation:
t
w
eak descripti
o
n of l
o
g
.
date
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-20
Jonathan
N
i
ed
e
r
Doc
u
mentation: set a !
D
OCTY
P
E for user manual
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-19
J
o
nathan N
i
eder
autoco
n
f: don'
t
u
se platf
o
rm regex if it l
a
c
ks REG_S
T
ARTEND
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
J
onathan Nieder
merge script: learn
--[no-]r
e
r
ere-
a
utoupdate
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
J
o
natha
n
Nied
e
r
merge script: notice @
{
-1} shorthand
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nie
d
er
merge script: handle --
n
o
-
ff --no-c
o
mm
i
t correctly
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
merg
e
sc
r
ipt:
-
-ff-only
t
o d
i
sallow true
m
erge
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nied
e
r
m
erge script: handle many-way octopus
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jona
t
h
a
n Niede
r
merge sc
r
i
p
t: handle
-m --log correc
t
l
y
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jo
n
ath
a
n Nieder
merge script: fo
r
bid
m
e
rge -s index
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
merge sc
r
ipt
:
allow custom strategi
e
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan
Nieder
merge
s
cript: merge -X<option>
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
mer
g
e script: impr
o
ve lo
g
message subject
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
merge script: refuse to merge
d
u
ring merge
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
merge script: tweak unmerged
file
s
me
s
s
a
ge to match
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
mer
g
e s
c
r
i
pt: --squash,
--ff from
u
nb
o
rn
branch are
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
J
onathan Nieder
fmt-merge
-
msg -m to overr
i
de merge t
i
tle
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonat
h
a
n Nieder
merge-base --indepe
n
dent to print reduced parent list
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonatha
n
Nieder
mer
g
e-base --octo
p
u
s
t
o
mimic show-b
r
anch --merge-base
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
J
o
n
a
th
a
n Nieder
Documentation
:
add a SE
E
ALSO sec
t
ion for
m
erge-b
a
s
e
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
t6200
(fmt-
m
e
rge-msg):
s
tyle nitp
i
cks
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
t6010 (
m
erge-base): modernize
s
tyle
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nied
e
r
t
7
6
00 (mer
g
e): test merg
e
f
rom
branc
h
yet to be born
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
t7
6
00 (merge
)
:
c
h
eck reflog
e
ntry
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonath
a
n Nieder
t7600 (merge): do not
l
au
n
c
h
gitk
f
or --de
b
ug
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jona
t
h
a
n Nieder
t7600 (merge): mo
d
erni
z
e style
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan
N
ieder
mer
g
e: do not
m
istake (ancesto
r
of) tag for branch
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-16
Jonat
h
an Nieder
t
70
0
6 (
p
age
r
): add mi
s
sing TTY prere
q
uisites
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-16
Jonathan
N
i
e
der
merg
e
: let custom stra
t
egies intervene in triv
i
al
merges
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-16
Jonathan Ni
e
d
er
t760
6
(
merge-theirs
)
: mode
r
n
i
z
e
st
y
l
e
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
next