repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
t/t9001-send-email.sh: fix stderr redirection in 'Invalid In-Reply-To'
2010-08-06
Jonat
h
a
n
Nieder
Do
c
umentati
o
n/techni
c
a
l:
docum
e
nt ll_merge
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan Nieder
me
r
ge-trees: le
t
calle
r
deci
d
e whether to renormalize
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-06
J
onathan
Nied
e
r
merge-trees
:
pu
s
h choice to ren
o
rmalize
a
w
a
y from low
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-06
J
onat
h
an
N
ieder
t60
3
8 (merge
.
renorma
l
i
z
e)
:
check
t
hat it ca
n
be turne
d
of
f
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-06
Jo
n
athan Ni
e
der
t6038 (me
r
g
e
.
ren
o
rmal
i
ze): try c
h
eckout -m and cherry
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan
Nieder
t6
0
38 (merge
.
r
e
norm
a
li
z
e):
s
tyle nitpick
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-06
Jonatha
n
Nie
d
e
r
diff
:
spl
i
t o
f
f a function
f
or --s
t
at-*
o
ptio
n
parsing
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-04
Jonathan Nieder
t4111
(
apply): refresh in
d
ex be
f
ore a
p
p
l
ying patches
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-02
J
o
nathan Nie
d
e
r
Doc
u
mentation: flesh out “git
pull” description
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-02
Jonathan
N
ieder
gi
t
web: allow co
n
f
i
gurations
t
h
a
t
change w
i
th each
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-02
Jonatha
n
Nieder
t1011 (sparse c
h
e
c
ko
u
t
): sty
l
e n
i
tp
i
cks
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-27
Jonathan Nieder
e
x
a
mples/c
o
m
m
it:
use --abbrev for commit summary
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-27
Jonathan Nieder
ch
e
ckout, commit:
r
emo
v
e c
o
nf
u
sing
a
s
s
i
gnme
n
ts to rev
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-27
Jonathan Nieder
arch
i
v
e
: abbreviate substituted commit ids agai
n
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-27
Jonathan Nie
d
er
conf
i
g --get --path: check fo
r
unset $HOME
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-26
Jonathan
Nieder
setup: split
o
f
f
get_devi
c
e_o
r
_di
e
helper
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-26
Jon
a
than
N
iede
r
setu
p
: split of
f
a
funct
i
on t
o
h
a
ndle
hitting ce
i
ling
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-26
Jon
a
than Nieder
setu
p
: split
off co
d
e
t
o
h
andle stumbling upo
n
a repository
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-26
Jonath
a
n
Nieder
setup: split off a f
u
n
c
tion to checks
wo
r
k
ing
dir
for
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-26
Jonathan Nieder
s
e
tup: spli
t
o
f
f $GIT_DIR-s
e
t case fr
o
m setup_git_directory_
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-26
Jonathan Nieder
t
ests: try
g
it a
p
ply from subdir
o
f toplevel
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-26
J
o
nat
h
a
n
Nieder
t150
1
(rev-parse): cl
a
rify
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-23
Jonathan Niede
r
t
3
400 (rebase): whitespace
c
leanu
p
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-23
Jonathan Nie
d
e
r
t415
0
(am): futurep
r
oof against failin
g
tests
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-23
Jonath
a
n N
i
eder
t
4
150 (a
m
): style fi
x
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-21
Jonathan
Niede
r
t/README: correct an exception when breaking
a
&
& ch
a
in
.
.
.
commit
|
commitdiff
|
tree
2010-07-16
Jonathan N
i
eder
Add
a
sample user for the svnd
u
m
p
library
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-15
J
o
n
a
than Nieder
E
x
port p
a
rs
e
_date_basic() to convert a date
string
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-15
Jonathan Nieder
Documenta
t
ion:
a
d
d sub
m
o
dule
.
* to
the big configuration
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-15
Jonathan Nieder
git
m
o
dules
.
5: url can
be a re
l
a
t
ive path
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-14
Jonathan Nieder
git --paginate: p
a
ginate external
c
ommands again
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-12
Jona
t
h
an
N
ie
d
er
t3000 (ls-
f
iles -o):
moderniz
e
sty
l
e
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-08
Jon
a
than Nied
e
r
t
9
118 (git-svn): prev
e
nt early
f
ai
l
ure from taking
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-07
Jonatha
n
Nieder
t
/
REA
D
ME:
d
o
cume
n
t more test helpers
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-05
Jonatha
n
Nieder
Teach fas
t
-
import
to import subtree
s
named
by tre
e
id
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-29
Jona
t
han Nieder
rever
t
: do not rebuild argv
on heap
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-28
Jon
a
t
ha
n
Nied
e
r
tes
t
s: loca
l
config file should
be h
o
nored
from
s
u
b
di
r
s
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-28
Jona
t
han Nie
d
e
r
t7
0
06: test pager configur
a
tion
for
sev
e
r
al git c
o
m
m
a
nds
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-28
Jo
n
athan Nie
d
er
t7006 (pager): introduce helper for parameteriz
e
d
test
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-14
J
o
n
a
than Niede
r
t3508 (cherry-pick): f
u
t
u
r
e
p
r
oof again
s
t
u
nmerged files
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-14
Jonathan Nieder
git-svn: st
r
ip of
f
leadin
g
slashes on --t
r
unk arg
u
m
e
nt
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-13
Jonathan Nieder
add-interactiv
e
: Clarify “remainin
g
hunks in the fil
e
”
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-13
Jonathan Ni
e
der
grep: r
e
fact
o
r
gr
e
p_object
s
l
oop in
t
o
i
ts o
w
n fu
n
ct
i
o
n
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-11
J
o
nathan Ni
e
d
e
r
Documentation/che
c
kout: clar
i
fy description
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-11
Jon
a
than Nieder
rebas
e
-i -p: document shortcomings
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-02
Jonathan
N
ieder
DWIM 'g
i
t
show -
5
' to
'git show
-
-do-walk -
5
'
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-01
J
onat
h
an Nieder
gitignore
.
5:
Clarify
matc
h
ing
ru
l
es
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-01
Jonathan
N
i
e
d
er
reb
a
se: improv
e
error messag
e
when ups
t
ream
a
r
g
ume
n
t
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-01
Jonathan Nieder
Documentat
i
on/checkout: clari
f
y de
s
cription
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-28
Jon
a
t
h
an Nieder
fsck: fix bogus
comm
i
t header c
h
eck
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-20
Jonathan Ni
e
der
Add
g
it remote set-bra
n
c
h
es
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-20
Jon
a
than Nieder
post-r
e
ceive
-
e
m
a
il: d
o
cument
command-line mode
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
J
onathan
N
ieder
git svn: a
v
oid u
n
in
i
tialized var in 're
s
et'
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan N
i
eder
Makefile: let h
e
ader
d
epend
e
ncy checker overri
d
e COMPUTE_HE
A
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
J
o
nathan Niede
r
Mak
e
f
ile: fi
x
hea
d
e
r depende
n
c
y ch
e
cker to all
o
w NO_CU
R
L
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Nieder
Doc
u
mentation
/
not
e
s: nitpicks
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jo
n
athan Nieder
D
o
cu
m
entatio
n
/not
e
s: clean
u
p description of rewriting
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan
N
iede
r
Do
c
umentation/notes:
sim
p
lif
y
treatment
o
f
default
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jo
n
atha
n
N
ieder
Docum
e
n
t
ation/log
:
a
d
d
a C
O
N
FIGURATION section
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonatha
n
Nie
d
er
Documen
t
ation/notes: simplif
y
trea
t
ment o
f
default
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jona
t
ha
n
Nied
e
r
Docu
m
ent
a
tion/n
o
tes: add
configu
r
at
i
on section
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Nie
d
er
Do
c
ument
a
t
ion/
n
otes: describe content
o
f note
s
blobs
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
J
o
nathan Nieder
Doc
u
me
n
t
a
tion/notes: docum
e
nt format
o
f no
t
es trees
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-08
Jonathan Nieder
c
h
e
rry-pick:
do not du
m
p core
wh
e
n iconv fails
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-08
Jonathan Nieder
pretty: init
i
a
lize new cmt_fmt
_
map to 0
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-08
Jo
n
athan Nieder
ad
a
pt r
e
quest-pull tests for n
e
w pull
r
equest
f
ormat
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-06
Jonatha
n
Niede
r
test-lib: some shells
d
o not let
$
? p
r
opagate into
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jon
a
than Nieder
s
hor
t
log: Document and test --format option
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jonat
h
an Nie
d
er
t
42
0
1 (shortlog)
:
Tes
t
output format
with mult
i
ple
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jonathan N
i
eder
t
4
2
01 (s
h
ortlog):
g
uard setup with te
s
t_expect_su
c
cess
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jonathan Nieder
Docu
m
e
ntation/sho
r
tl
o
g: scripted users should not rely
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
J
o
n
a
tha
n
N
i
e
der
commit --
a
mend: cop
e
w
i
th missi
n
g display
nam
e
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jo
n
athan
N
ieder
test-l
i
b: L
e
t tes
t
s
specify com
m
ands to
b
e
run at
e
nd
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-01
J
onathan Nieder
fsck:
c
heck ident
li
n
es in commit objects
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-01
Jonathan Nieder
r
equest-pull: protect
against OPTIO
N
S
_
KEEPDASHDASH
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-01
Jona
t
han Nieder
tes
t
s for
reques
t
-
p
ull
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-22
Jo
n
atha
n
N
i
ede
r
Docume
n
ta
t
i
on/Mak
e
file:
fix
i
nte
r
rupte
d
buil
d
s of user
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-20
J
o
n
a
t
han Niede
r
fix
"
b
undl
e
--stdin" segfa
u
lt
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-20
J
o
nathan
N
ie
d
er
t
5704
(
bundle): add tests
fo
r
bu
n
dl
e
--stdin
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-17
J
o
nathan Nie
d
er
tag -v: use RUN_GIT_C
M
D
to
run verify-tag
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-15
Jonathan Nieder
Document ne
w
"a
l
ready-merged" rule for b
r
anch
-d
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-15
J
o
nathan Nie
d
er
Add
.
de
p
e
n
d direct
o
ries to
.
gitig
n
ore
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-15
Jonathan Nie
d
er
t7006:
g
uard
c
leanup
with test_
e
xpect_su
c
cess
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-13
J
o
nathan Nied
e
r
t
5800: t
e
stgit
h
elper requ
i
res P
y
thon
support
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-11
Jonathan Nieder
t74
0
0: clarify
s
u
b
m
odule update tests
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-11
Jo
n
a
than
N
ieder
t7400: clarify '
s
ubmodule add' te
s
ts
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-11
Jonath
a
n Nieder
t7400: split
setup
i
nto m
u
ltiple tests
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-04
Jonatha
n
N
ieder
Teach mailinfo
%< as an alter
n
at
i
v
e
scis
s
o
r
s
m
ark
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-03
Jonathan
Ni
e
der
M
a
k
efile: future-proof Cy
g
win version check
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
J
o
nath
a
n Nieder
m
e
rg
e
-rec
u
rsive:
add a labe
l
for
a
n
cestor
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
cherry-pick
,
revert
:
add a la
b
el
f
o
r ancestor
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
J
o
n
athan
Nieder
rever
t
: cl
a
rify
l
a
b
el on con
f
lict hunks
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
J
onathan Ni
e
der
compat
:
add mempcpy()
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jo
n
a
t
han Nieder
checkout -m --conflic
t
=d
i
ff3:
add
a
label for ancestor
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonatha
n
N
ieder
m
e
rge_trees(): add anc
e
st
o
r
l
a
bel par
a
m
e
ter for d
i
f
f
3
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
J
o
nathan Nieder
merge_file
(
)
: add comment expl
a
ining behavior wrt con
f
l
i
c
t
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@mgila.com>
commit
|
commitdiff
|
tree
2010-03-21
Jo
n
atha
n
N
ie
d
er
checko
u
t --conflict=diff3: ad
d
a l
a
bel
f
or ancestor
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
l
l
_
m
erge(): add ances
t
or
label
pa
r
am
e
t
er
f
or di
f
f3
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
merge-file --di
f
f
3: add a label for ancestor
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jo
n
athan Nieder
xdl_merge()
:
move fil
e
1 and fi
l
e2 labels to xmparam
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
next