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
t1502 (rev-parse --parseopt): test exit code from "-h"
2010-08-06
J
o
n
a
than
N
ieder
Docum
e
ntation/technical:
d
ocument ll_merg
e
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-06
Jona
t
han Nieder
merge
-
tre
e
s: let caller decide
whet
h
er
t
o
reno
r
malize
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan Nieder
merge-
t
rees: pu
s
h cho
i
ce to renormalize
a
way from lo
w
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-06
J
o
nathan Nie
d
er
t6038
(
merg
e
.
renormal
i
ze): check that
i
t c
a
n b
e
tu
r
ned off
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan Niede
r
t603
8
(me
r
ge
.
renormalize): try che
c
k
o
u
t -m
and c
h
erry
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan Nieder
t6038
(merge
.
renormali
z
e):
style nit
p
icks
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-06
J
o
nathan Nied
e
r
dif
f
: split
off
a function for --stat-* opt
i
on parsing
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-04
Jonathan
Nied
e
r
t411
1
(
a
p
p
ly
)
: ref
r
es
h
i
n
d
e
x before applying patches
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-02
Jon
a
than Nieder
D
o
cu
m
ent
a
ti
o
n: flesh out
“
git pul
l
”
descr
i
ption
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-02
Jonathan
Nieder
gitw
e
b: allow
conf
i
gu
r
ations that chan
g
e with each
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-02
Jonathan Nieder
t1011 (
s
parse che
c
kout): sty
l
e nit
p
icks
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-27
Jonathan Nieder
e
xamples
/
commi
t
: u
s
e --abbrev f
o
r
c
ommit summary
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-27
Jonatha
n
Nieder
checko
u
t, commit
:
r
e
move confusing ass
i
gnments to
r
e
v
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-27
Jonatha
n
Nieder
ar
c
h
i
ve:
a
bbrevia
t
e
s
u
bstitut
e
d com
m
it i
d
s again
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-27
Jo
n
a
t
ha
n
Nieder
config --
g
et --path: check for
unset $HOM
E
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-26
Jonath
a
n Nied
e
r
setup: split o
f
f ge
t
_
devic
e
_
or_die helper
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-26
Jonath
a
n Nieder
setup: split off
a
function to
han
d
le hitting ceiling
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-26
Jonathan N
i
eder
se
t
u
p
:
s
p
li
t
off code
to h
a
n
d
le stumb
l
in
g
u
p
o
n
a repository
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-26
Jonathan N
i
eder
setup:
s
plit off a function t
o
check
s
w
o
r
k
ing d
i
r for
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-26
Jonathan N
i
eder
setup: split off
$
GIT_DI
R
-
s
et
case
from setup_git_directory_
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-26
Jonathan Nieder
tests: try
git
apply from
s
ub
d
ir of
toplevel
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-26
Jonathan Nied
e
r
t
1501
(
rev-pa
r
s
e
): clarify
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-23
Jo
n
athan Ni
e
de
r
t340
0
(rebase): whitespace cleanup
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-23
Jo
n
athan Ni
e
der
t415
0
(am): futureproof against failin
g
tests
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-23
Jo
n
athan Nieder
t4150 (am)
:
style fi
x
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-21
Jonatha
n
Nieder
t/README
:
correct an exception when breaking a && c
h
a
i
n
.
.
.
commit
|
commitdiff
|
tree
2010-07-16
Jon
a
than Nied
e
r
Add a samp
l
e user
f
o
r the svndu
m
p library
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-15
Jonath
a
n Nieder
Export parse_
d
a
te_basi
c
() to convert a
dat
e
s
t
r
i
ng
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-15
J
o
nathan
N
ieder
Documentation:
add submod
u
le
.
* to
t
he big
c
onf
i
g
uration
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-15
Jonath
a
n Nieder
g
i
tmodules
.
5: url can be a relative
p
ath
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-14
Jonathan Nieder
git --paginate: paginate
e
xterna
l
co
m
ma
n
ds again
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-12
Jo
n
athan Nieder
t3000 (l
s
-files
-
o): modernize style
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-08
Jonathan Nieder
t
9118 (g
i
t-
s
v
n
): pre
v
ent early failur
e
f
rom ta
k
ing
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-07
Jonathan Nieder
t/REA
D
ME: document more
t
est helpers
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-05
Jonatha
n
N
i
eder
Teach fas
t
-import
t
o im
p
ort subtrees named by tree id
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-29
J
o
nathan N
i
eder
reve
r
t: d
o
not r
e
build argv on heap
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-28
Jonat
h
an Nieder
tes
t
s:
lo
c
al co
n
fig file should be honored f
r
om subdirs
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-28
J
o
nathan
N
ieder
t7006: test pager configurat
i
on f
o
r
s
ever
a
l
git
commands
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-28
Jo
n
athan Nieder
t7006
(pag
e
r):
i
n
t
roduce h
e
lper for
par
a
meterized tests
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-14
Jonath
a
n
Nied
e
r
t3
5
08 (cherry
-
p
i
ck): futureproof against un
m
erged fil
e
s
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-14
Jonatha
n
Nieder
git-svn: strip off
leading slash
e
s on -
-
tr
u
nk
a
rg
u
ment
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-13
Jonathan Nie
d
er
add-interact
i
ve: Clarify “remaining
h
unks in
t
he file”
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-13
Jo
n
at
h
an Nieder
gr
e
p:
refa
c
tor grep_objects loop into its own fun
c
tio
n
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-11
J
o
nathan Nieder
D
o
cument
a
tion/checkout: clarify
description
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-11
Jonath
a
n Nieder
r
ebas
e
-i -p: doc
u
me
n
t sho
r
tcomings
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-02
Jonathan Nieder
DWIM 'git show -5' to
'
git show --
d
o-walk -5'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-01
Jonathan Nieder
gi
t
ignore
.
5: Clarify
matching rules
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-01
Jonath
a
n Nie
d
er
rebase:
improve
e
r
ror mes
s
age when
upstream ar
g
u
ment
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-01
Jonathan
Nieder
D
o
cum
e
n
t
a
t
ion/checkout: clarif
y
descri
p
tion
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-28
Jonathan Nieder
fsck: fix bogus c
o
mmit h
e
a
d
er check
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-20
J
on
a
than Nieder
Add g
i
t remote set-branches
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-20
Jonathan Nieder
p
o
s
t
-rece
i
ve-e
m
ail: document
c
omma
n
d-
l
ine mode
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
Jonat
h
an Nieder
git svn: avoid u
n
in
i
ti
a
l
i
z
e
d var in 'reset'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
J
onathan Nie
d
er
Makefile
:
let heade
r
dependen
c
y checker override COMPU
T
E
_HEA
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
Jo
n
a
t
han N
i
ed
e
r
M
a
k
e
f
ile: fix header
depende
n
cy c
h
e
ck
e
r
t
o allow NO_CURL
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
Jon
a
than
N
iede
r
Docu
m
entati
o
n/notes:
n
itpicks
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
Jon
a
than Ni
e
der
Doc
u
mentation/notes: c
l
ean
u
p
desc
r
i
p
tion of
rewriting
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
Jonath
a
n Nieder
Documen
t
ati
o
n/notes: simpli
f
y tr
e
atment of
d
efault
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan
N
ieder
D
o
cumentation/l
o
g
:
add a C
O
NFIGUR
A
T
I
O
N section
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
J
o
nath
a
n N
i
ede
r
Documentati
o
n
/
not
e
s:
s
im
p
li
f
y tr
e
atm
e
nt of default
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Niede
r
Documentation/not
e
s: add configuration s
e
ct
i
on
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
Jon
a
than Nieder
Documenta
t
ion/notes:
desc
r
ibe conte
n
t of notes blo
b
s
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan
Nieder
D
o
cumentation/notes: d
o
cu
m
ent format
of notes trees
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-08
Jona
t
han Nieder
c
h
erry
-
p
ick
:
do not dump core
w
h
e
n
iconv fails
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-08
Jonathan Nieder
pretty: ini
t
i
a
lize new cmt_fm
t
_map to
0
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-08
Jonathan Nieder
a
dapt request-pull tests for new
pull req
u
est fo
r
m
a
t
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-06
Jonath
a
n Nieder
test-l
i
b: some shells do not let $? propag
a
te into
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-04
Jonathan Nieder
shortlog: D
o
cument an
d
test --format op
t
ion
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-04
Jo
n
athan N
i
eder
t4
2
01 (short
l
og): Test output format with m
u
ltip
l
e
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-04
Jona
t
han Nieder
t4201 (shortlog): guard setup with te
s
t_expe
c
t_suc
c
ess
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-04
Jonat
h
an Nieder
Documentation/shortlog: scripted users should not rely
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-04
Jona
t
han Nieder
c
o
mmit --amend: co
p
e
wi
t
h
m
issing dis
p
l
ay n
a
m
e
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-04
J
o
nat
h
a
n Nieder
test-lib: Let te
s
ts s
p
e
cify com
m
and
s
to be run at end
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-01
Jo
n
a
than
N
ie
d
er
fsck: c
h
e
c
k iden
t
lines in com
m
it o
b
jects
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-01
Jonathan
Niede
r
request-p
u
ll: prot
e
ct
a
gains
t
OPTI
O
NS
_
KE
E
PDASHDASH
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-01
Jonathan Nieder
tests
for
r
eque
s
t-
p
u
ll
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-22
Jonath
a
n Nieder
Documentatio
n
/Ma
k
efile: fix interrupted builds o
f
u
ser
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-20
Jonat
h
a
n Nieder
fi
x
"bundle --stdin" segfault
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-20
Jonat
h
a
n Nie
d
e
r
t5704 (bun
d
le): add t
e
sts for bund
l
e -
-
stdin
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-17
Jonathan Nie
d
er
t
a
g
-v: use
RUN
_
GIT_CMD to
run
v
erify-tag
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-15
Jonathan
N
ieder
Docu
m
ent new "alr
e
ady-me
r
ged" rul
e
for branch -d
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-15
J
onathan Nieder
A
d
d
.
d
e
pend director
i
es to
.
g
itignor
e
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-15
J
o
nathan
N
ie
d
er
t700
6
:
guard c
l
ea
n
up with
t
e
s
t
_
e
x
pect
_
suc
c
ess
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-13
Jo
n
athan Nieder
t5800: te
s
tgit helper
requires Python
s
uppor
t
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-11
Jonathan
Nieder
t7400: clarify
submodule updat
e
tests
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-11
Jonathan Niede
r
t
7
400
:
clarify 'submodule add' tes
t
s
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-11
Jonathan
N
i
eder
t
740
0
: split s
e
tup into multi
p
le tests
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-04
Jo
n
athan Niede
r
T
each mailinf
o
%
<
a
s a
n
alternative scissor
s
ma
r
k
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-03
Jonathan Nie
d
e
r
Makefile: future-proof Cygwin versi
o
n
c
h
e
c
k
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
merge-recursi
v
e
:
add
a
label for ancestor
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonat
h
an
N
ieder
ch
e
rry-pick, revert: add
a l
a
bel for ance
s
tor
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
J
o
nathan Nieder
rev
e
r
t
: clarify
label on
conf
l
ict hunks
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonatha
n
Nieder
c
ompa
t
: add mempcpy()
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Niede
r
chec
k
out -m --confl
i
c
t=dif
f
3
: a
d
d a label for ancesto
r
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonatha
n
Ni
e
d
e
r
m
e
rge_trees(): add
anc
e
s
t
or la
b
e
l par
a
m
eter for diff3
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jo
n
athan Nieder
merge_file(): ad
d
c
o
mment
e
xplaining b
e
havior wr
t
conflict
.
.
.
commit
|
commitdiff
|
tree
2010-03-21
Jo
n
athan Ni
e
der
checkout --co
n
fl
i
ct=diff3:
add a label
for ancestor
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
ll_mer
g
e():
a
d
d
ance
s
t
or label paramete
r
for diff3
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jona
t
han N
i
eder
me
r
ge-file --diff3
:
add a label
for ancestor
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jo
n
athan N
i
eder
x
d
l_merg
e
(): m
o
ve file
1
and file2
l
ab
e
ls to xmparam
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
next