repo.or.cz
/
git
/
mjg.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'sg/rerere-gc-old-still-used'
2010-08-24
Jonathan Nieder
parse-options
:
cla
r
ify PARSE_OPT_NOARG des
c
r
iption
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-24
Jonathan Nied
e
r
t3302 (notes):
P
ort
to
S
olaris
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-12
Jonathan Nie
d
er
Sta
n
dardize
do
{
.
.
.
} whil
e
(0) styl
e
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-11
Jonath
a
n Nie
d
er
write-tree:
A
void leak when i
n
d
e
x refer
s
to
an invalid
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-11
Jo
n
athan Nied
e
r
r
e
a
d-
t
ree:
s
top le
a
kin
g
tree ob
j
ects
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-11
Jonathan Nie
d
er
core: Stop leaking ondisk_cache_entrys
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-09
Jonathan
Nieder
gitwe
b
: cla
r
ify search results p
a
g
e w
h
en
n
o matching
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-09
Jonathan Nieder
D
o
cumentatio
n
:
add
a FILES section for
sho
w
-ref
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-09
Jonat
h
an Niede
r
Ma
k
efil
e
: a
d
d mi
s
sing dep
e
n
d
ency
on http
.
h
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-09
Jonathan Nieder
Makefi
l
e: ad
d
missing dependencies on url
.
h
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan Nied
e
r
Allow
"
check
-
ref-f
o
rma
t
--bra
n
ch" from s
u
bdi
r
ectory
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-06
J
o
n
a
tha
n
Niede
r
check-ref
-
format: h
a
n
dle sub
c
o
mmands in separate
f
unctions
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-06
J
o
nathan Nie
d
er
diff: spli
t
o
f
f
a
fun
c
tion for -
-
sta
t
-* option
parsing
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-02
Jonat
h
an Nieder
D
o
c
umentati
o
n
: flesh ou
t
“git pull
”
descr
i
p
tion
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-02
Jona
t
han Ni
e
der
gitweb
:
allow confi
g
u
rations
that
change with e
a
ch
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-02
Jonat
h
an Nie
d
er
t
1011
(
spa
r
se
checkout): style n
i
tpicks
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-27
J
o
n
athan Nieder
examples/c
o
m
m
it
:
use --abbrev for commit summ
a
ry
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-27
Jonathan N
i
ede
r
c
h
ec
k
out, commit:
r
emove confu
s
ing as
s
ignments to rev
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-27
Jonath
a
n
Niede
r
archive:
a
b
breviate sub
s
t
i
tut
e
d c
o
mm
i
t ids
a
gain
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-27
Jonathan Nieder
con
f
ig -
-
get --path: c
h
eck
for unset $HOME
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-23
Jonathan Niede
r
t3400
(rebase): whit
e
space clea
n
up
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-23
Jon
a
than Nieder
t415
0
(
a
m):
futureproof against fai
l
ing tests
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-23
Jonathan N
i
eder
t4
1
50 (am): style fix
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-21
Jon
a
tha
n
Nieder
t/R
E
AD
M
E: correct an
excep
t
i
o
n whe
n
breaking
a
&&
c
hain
.
.
.
commit
|
commitdiff
|
tree
2010-07-16
Jo
n
a
th
a
n Nieder
Add a sample u
s
er fo
r
the svndump library
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-15
J
onathan
Nieder
Export pars
e
_date_basic() t
o
convert a date string
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-15
J
o
nath
a
n Nieder
Documen
t
at
i
on:
a
dd submodul
e
.
* to the big configurat
i
on
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-15
Jo
n
a
tha
n
Nieder
g
it
m
odules
.
5
:
url
ca
n
be a rel
a
tive
path
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-14
Jonathan N
i
eder
git --pagin
a
t
e
: p
a
ginate external co
m
m
ands aga
i
n
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-12
Jonathan Nieder
t3000 (l
s
-files -o
)
: m
o
dernize
s
t
y
l
e
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-08
Jonathan
N
ied
e
r
t9118
(git-svn): prev
e
nt ear
l
y
failure from taking
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-07
Jonath
a
n Nieder
t/R
E
ADME: do
c
ument mor
e
test
h
e
l
p
ers
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-05
Jon
a
t
han Nied
e
r
Teach
fast-
i
mport
t
o import s
u
b
t
rees named by
tr
e
e id
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-29
J
o
nathan Nie
d
e
r
revert: do
n
ot r
e
build a
r
gv on heap
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-28
Jonathan Nieder
t
est
s
: loc
a
l
confi
g
file should be ho
n
o
r
ed from su
b
dirs
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-28
Jon
a
t
h
an
Nieder
t
7
006: t
e
s
t pag
e
r config
u
ration for several git commands
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-28
Jona
t
han
Nied
e
r
t7006 (page
r
): intro
d
u
c
e h
e
lper for param
e
ter
i
z
ed tests
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-14
Jona
t
han
Nieder
t35
0
8 (cherry-pick): futureproof a
g
ainst unm
e
r
g
ed file
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-14
Jonathan Niede
r
git-svn: strip o
f
f leading slashes on --trunk arg
u
ment
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-13
J
o
nath
a
n Ni
e
d
er
add-interactive: C
l
arify “remaining hunks i
n
the file”
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-13
Jon
a
than N
i
e
d
er
g
r
ep
:
re
f
actor
grep_
o
bjects loop into its ow
n
function
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-11
Jo
n
athan Nieder
Documentat
i
on/che
c
kout: clarify desc
r
iption
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-11
Jona
t
han Nieder
reba
s
e -i -p: document shortcoming
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-02
Jona
t
han
N
iede
r
DWIM '
g
it
s
h
ow -5' to
'
git show --do-walk -5'
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-01
Jonathan Nieder
git
i
g
nore
.
5
: Clarify m
a
t
c
hing r
u
les
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-01
Jonathan Ni
e
der
r
e
base: improve error mess
a
g
e
w
hen upstr
e
am a
r
gument
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-01
Jonathan Nieder
D
o
cum
e
nta
t
ion/checkou
t
: clari
f
y d
e
scription
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-28
Jo
n
athan
Nieder
fsc
k
: fix bogus commit h
e
a
d
er check
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-20
Jo
n
athan
Nied
e
r
Add git
re
m
ote set-branches
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-20
Jonatha
n
Nieder
post-receive-ema
i
l: docu
m
ent command-line mode
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Nied
e
r
git
s
vn: av
o
id unin
i
t
ialized var
i
n
'
r
e
set'
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan
Nieder
Mak
e
file:
l
et hea
d
er dependency checker
o
verride COMPUTE_HEA
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Ni
e
der
Makefile: fix header
dependency chec
k
er to all
o
w
N
O_CURL
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
J
onat
h
an
N
ieder
Documentat
i
o
n/notes: nitp
i
cks
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jona
t
han Ni
e
der
Documentation/notes: clean
u
p description of rewriting
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
J
onathan Nied
e
r
Docume
n
t
a
t
i
on/notes:
simplify t
r
eatme
n
t
of
default
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Ni
e
der
Documentation/log: ad
d
a
CONFIGUR
A
T
ION sect
i
o
n
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonath
a
n
N
ieder
Do
c
umentation/notes
:
simpli
f
y tr
e
atment
of
d
efault
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonatha
n
N
ieder
Docume
n
ta
t
ion/notes
:
a
dd
configur
a
tion se
c
tion
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jon
a
t
ha
n
Nie
d
er
Docume
n
t
ation/notes
:
describe content
of notes
b
lobs
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
J
o
nathan Nie
d
er
Do
c
ume
n
tation/notes: docu
m
e
n
t
format of notes trees
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-08
Jon
a
t
h
an
Nieder
che
r
ry-pick: do not dump core when iconv fails
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-08
Jonathan N
i
e
der
pretty: initialize new cmt_fmt_map
to 0
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-08
Jonathan N
i
ed
e
r
ada
p
t request-p
u
ll test
s
f
or ne
w
pull
request f
o
rmat
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-06
Jonathan Nied
e
r
test
-
lib: some shells
do
n
ot let $? p
r
o
p
a
gate in
t
o
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jonathan Nieder
sh
o
r
tlog: Document
a
nd test --f
o
r
mat
opti
o
n
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jon
a
t
h
an
N
ie
d
e
r
t4201 (short
l
og
)
: Test
o
u
tput forma
t
with multiple
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jonathan N
i
eder
t4201
(
shortlog): gu
a
rd se
t
up with test_expect_success
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jon
a
t
han
N
i
eder
Docume
n
tation/shortlog
:
s
c
r
i
pted users s
h
ould
n
ot rely
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jonathan Nieder
commit --a
m
en
d
: co
p
e
wit
h
mis
s
ing di
s
play name
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jonath
a
n
Nieder
test-lib:
Let
t
ests spe
c
ify commands t
o
be run at
end
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-01
Jonathan Nieder
fsck:
c
heck id
e
n
t
lines
in commit objects
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-01
Jo
n
athan Nieder
request-p
u
ll
:
prot
e
c
t agains
t
OPTIONS
_
K
E
E
P
D
ASHDASH
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-01
J
onathan
Nieder
test
s
fo
r
r
e
quest-pull
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-22
Jo
n
athan
Nieder
Do
c
umentation/Mak
e
file:
f
ix i
n
t
e
rrupted builds
o
f use
r
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-20
Jo
n
athan Nieder
fix "bundle --std
i
n" segfault
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-20
J
o
nathan Nieder
t5704 (bundle
)
: add
t
ests
f
or b
u
ndle -
-
stdin
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-17
Jonathan Nieder
tag -v: use
R
UN_GIT_CMD
to run ve
r
i
f
y-tag
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-15
Jo
n
athan Nieder
Docum
e
nt
n
ew "already-
m
e
r
ged" ru
l
e for branch -
d
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-15
J
o
nathan Nieder
Add
.
de
p
end directories to
.
gi
t
ig
n
ore
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-15
Jonathan Nie
d
er
t
7
006: guard cleanup w
i
th tes
t
_expect_success
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-13
Jonath
a
n Nieder
t5800: testgit
h
el
p
er
r
equires Py
t
hon su
p
port
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-11
Jonathan
N
ieder
t7400: clarif
y
submodule update tests
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-11
Jonathan Nieder
t7400: clarify 'submodul
e
add' tests
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-11
Jonath
a
n Nieder
t7400:
s
plit setup into multiple tests
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-04
Jonathan Nieder
Teach
m
ail
i
n
f
o
%< as an al
t
e
rn
a
t
i
ve
s
cissors
mark
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-03
Jonathan Nieder
Makefile: future-proof Cygwin
version check
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonatha
n
Niede
r
merge-r
e
cursive: ad
d
a l
a
bel
f
or an
c
estor
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonath
a
n
N
ieder
c
herr
y
-
p
ick, revert: add a label
f
or ancestor
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jona
t
han Nieder
revert: clarify label
on c
o
nflict hunks
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
J
o
nathan Nieder
compat: add mempcpy
(
)
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
chec
k
out -m --
c
onflict=diff
3
: ad
d
a lab
e
l
for ancestor
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
J
o
na
t
han Nieder
mer
g
e_trees(): add ances
t
or l
a
be
l
par
a
met
e
r for diff3
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jon
a
tha
n
Nieder
merge_fi
l
e(
)
: add c
o
mment explaining behavior wrt conflict
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@mgila.com>
commit
|
commitdiff
|
tree
2010-03-21
J
o
na
t
h
an Nieder
ch
e
ckout --confli
c
t=diff3: add a label for an
c
estor
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonatha
n
N
i
eder
ll_merge()
:
a
dd ance
s
t
or label
parameter fo
r
d
i
f
f
3
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
m
e
rg
e
-file --dif
f
3: add a label
f
or ancestor
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jona
t
h
a
n N
i
eder
xdl_
m
erge(): move
f
ile1 and file2
l
abels
to xmpara
m
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jo
n
a
t
han Nieder
xdl_merg
e
():
a
d
d optiona
l
ancestor
l
abel
t
o
diff3-style
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jo
n
atha
n
N
i
eder
t
e
sts:
documen
t
cherry-pi
c
k
b
ehavior
i
n
face
o
f co
n
flict
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
next