repo.or.cz
/
alt-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
http-push: Normalise directory names when pushing to some WebDAV servers
2010-08-06
J
onathan
N
ied
e
r
ll-merge: make flag
e
asi
e
r to populate
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan
Nieder
Documentati
o
n/technical: do
c
ument
l
l_merge
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-06
J
o
n
athan Ni
e
d
e
r
m
e
r
g
e
-tre
e
s: let
c
all
e
r dec
i
de
whether to renormalize
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan Nie
d
er
merg
e
-trees:
push ch
o
ice to renormali
z
e
a
way from low
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan
N
iede
r
t
6
038
(
m
e
r
ge
.
ren
o
rm
a
lize): check that it can be tu
r
ned off
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-06
Jo
n
atha
n
Nieder
t6038 (merge
.
renorm
a
lize): tr
y
checkout -m and cherry
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-06
Jonat
h
a
n
Nieder
t6038 (m
e
r
g
e
.
ren
o
rm
a
lize): style nitpicks
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-06
Jona
t
han Nieder
diff: split off a
funct
i
on for --stat-* o
p
tion parsing
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-04
Jonathan Nieder
t4111 (apply): refresh ind
e
x before applying patches
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-02
Jonathan Nieder
Docume
n
t
a
tion: f
l
esh out “
g
it pull” description
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-02
Jonathan N
i
e
der
gi
t
w
e
b: a
l
low c
o
n
figurations
t
ha
t
cha
n
ge with each
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-02
Jonathan Nieder
t1
0
11 (spa
r
se ch
e
ckou
t
):
s
tyle n
i
tpicks
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-27
Jonathan
Nieder
e
xamples/c
o
mmi
t
: use --abbrev for c
o
mmit
summary
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-27
Jonathan Nieder
checkout, commit: re
m
ove
con
f
using
assignmen
t
s
to rev
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-27
Jonathan Niede
r
ar
c
hive: abbreviate subs
t
itu
t
ed com
m
it
ids again
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-27
Jonath
a
n
N
i
e
d
er
config
-
-get
-
-
p
ath: c
h
eck f
o
r unset $H
O
ME
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-26
Jonathan Nieder
setup: split off get_devic
e
_or_die hel
p
er
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-26
Jon
a
than Ni
e
der
setup: sp
l
it off a functi
o
n
t
o
handle hitti
n
g cei
l
ing
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-26
Jonath
a
n Nieder
s
etup: split o
f
f
code t
o
handle stumbling upon a rep
o
sitory
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-26
Jonathan Nieder
setup:
s
p
li
t
o
f
f a function to checks working d
i
r for
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-26
Jonat
h
an Nieder
setup:
spl
i
t
off $GIT_
D
IR-
s
et c
a
se from setup
_
git_dire
c
t
or
y
_
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-26
J
o
nathan Nied
e
r
tests: try git apply
f
ro
m
s
u
b
d
i
r o
f
t
ople
v
el
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-26
Jonathan Nieder
t
1
501 (rev-parse): clarify
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-23
Jonathan
N
i
eder
t3400 (rebase):
whit
e
space cleanup
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-23
Jonath
a
n
Nieder
t4150 (am): fut
u
rep
r
oo
f
agains
t
f
aili
n
g test
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-23
Jonat
h
an Nieder
t4150
(
am): style fix
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-21
Jonathan Nieder
t/README: c
o
rrect an excepti
o
n whe
n
b
r
eaking a
&& chain
.
.
.
commit
|
commitdiff
|
tree
2010-07-16
J
ona
t
han Nie
d
er
A
d
d a
s
am
p
le
use
r
for the svn
d
ump library
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-15
Jonathan Ni
e
der
Export parse_date_bas
i
c() to c
o
nvert a date string
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-15
Jonathan Ni
e
der
Documen
t
ation: add submodule
.
*
to the big
c
o
nfigura
t
ion
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-15
Jonathan Nieder
g
i
tmodules
.
5: u
r
l can
b
e a relative pa
t
h
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-14
Jonathan N
i
eder
git
-
-
paginate
:
paginate
e
xterna
l
c
o
mm
a
nds again
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-12
Jonatha
n
N
i
eder
t
3000 (ls-fi
l
e
s -o): modernize s
t
yle
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-08
Jona
t
han Niede
r
t9118
(g
i
t-svn): prevent early failure
f
r
om
t
aki
n
g
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-07
J
o
n
a
t
ha
n
Nieder
t/REA
D
ME:
docume
n
t
more test
helpers
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-05
Jonathan Niede
r
Teach f
a
st-import
t
o impo
r
t subtrees named by tree
id
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-29
Jonathan
Nieder
revert: do not rebuild
a
rgv
on heap
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-28
Jonathan
N
ieder
tests
:
local
c
o
n
f
ig fi
l
e
s
h
o
uld be ho
n
ored fr
o
m
subdirs
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-28
Jona
t
han
Nieder
t70
0
6: test
pager configuratio
n
for
s
everal git commands
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-28
Jon
a
than
N
iede
r
t
7
00
6
(p
a
ge
r
): introduce he
l
p
er f
o
r parameteri
z
ed tests
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-14
Jonathan Nieder
t
3
508 (c
h
erry-pick): futu
r
eproof against
unmerged files
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-14
Jonathan Nieder
g
i
t
-
svn: strip off le
a
ding slashes on
--trunk argument
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-13
Jon
a
tha
n
Nieder
a
dd-in
t
eractive: Clarify “remaining hun
k
s in the file”
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-13
Jonathan Ni
e
d
e
r
g
rep: re
f
actor grep_
o
bjec
t
s loop into
its own func
t
ion
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-11
Jona
t
h
a
n Nieder
Do
c
ument
a
tion/checko
u
t: cla
r
ify desc
r
iption
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-11
J
o
n
a
than Niede
r
reb
a
se -i -p
:
docum
e
n
t
s
h
ortcomings
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-02
J
onathan
N
i
eder
DWIM
'
git sho
w
-5' to
'
git show --do
-
walk -5'
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-01
Jonathan Nieder
gi
t
ign
o
re
.
5:
C
larify matching
rules
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-01
Jonathan Nied
e
r
rebase: improve erro
r
mes
s
age when upstrea
m
argum
e
nt
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-01
Jonathan Nieder
Documentatio
n
/chec
k
out: clarify
d
escript
i
on
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-28
Jon
a
than
N
ieder
fsck:
fix bogus commit hea
d
er check
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-20
J
onathan Nieder
A
d
d git
remote set
-
b
r
anches
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-20
Jonathan Nieder
p
o
st
-
receive-email: do
c
ument command-line mode
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan
Niede
r
g
it
s
vn: avoid
u
nin
i
tial
i
zed var in 'rese
t
'
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jona
t
han
N
ieder
M
a
kefile: let
h
eader
de
p
end
e
ncy check
e
r
o
verride COMPUTE_HEA
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
J
onathan Nied
e
r
M
a
kefile:
fi
x
h
e
ader depende
n
c
y
c
he
c
ker
to
a
llow NO_CURL
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jona
t
han
Nieder
Documentat
i
o
n
/n
o
tes: nitp
i
cks
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Niede
r
Documentation/notes: cl
e
an up descri
p
tion of rew
r
iting
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jo
n
athan Nieder
Documentat
i
on/no
t
es: s
i
m
p
lify treatment
of default
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Nied
e
r
Documentat
i
on/lo
g
:
add a CONFIGURA
T
ION section
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Nieder
Docu
m
entation/notes: s
i
m
plify treatment of
defa
u
l
t
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Nie
d
e
r
Documentat
i
on/no
t
e
s
: ad
d
config
u
ration section
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
J
o
nathan Nieder
Doc
u
mentation/not
e
s: d
e
scr
i
b
e c
o
ntent of notes blob
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jona
t
han Nieder
Documentat
i
on
/
no
t
es:
d
ocument
f
ormat of n
o
tes
trees
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-08
Jo
n
ath
a
n
N
i
eder
c
he
r
ry-pick: do
not dump c
o
re when ico
n
v fails
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-08
Jonathan N
i
eder
pretty: initialize ne
w
cmt_fmt_map
t
o 0
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-08
Jonathan Nie
d
e
r
adapt reque
s
t
-pull tests for
n
ew pull
request format
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-06
Jonathan
N
i
eder
te
s
t-lib: some
s
he
l
l
s do not let
$
?
propa
g
at
e
i
n
to
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jonathan Nieder
shor
t
log: Do
c
u
m
ent an
d
te
s
t
-
-for
m
at option
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jonath
a
n Nied
e
r
t4201 (sho
r
tlog): Test outpu
t
f
or
m
a
t
wi
t
h
m
ultiple
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jonat
h
an Nie
d
er
t42
0
1 (shortlog):
guard se
t
up with test_expect
_
s
u
ccess
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jonathan Nieder
Do
c
umentation/shor
t
log: sc
r
ipted
users
should not rely
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jonathan N
i
eder
co
m
mit --amend:
c
ope w
i
th miss
i
ng disp
l
ay name
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jon
a
than Ni
e
der
test-lib: Let tests sp
e
c
ify co
m
mands to be run at end
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-01
Jonathan Nieder
fs
c
k: check ident lines in commit
objects
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-01
Jonathan Nied
e
r
request
-
pu
l
l: pr
o
tect ag
a
inst OPTIONS_KEEPDASHDA
S
H
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-01
J
o
nat
h
an
N
iede
r
tests fo
r
r
equest-pull
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-22
Jona
t
han Niede
r
Documen
t
a
t
ion/Makefil
e
: fix interrup
t
ed
b
uilds of user
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-20
J
o
na
t
han Nied
e
r
fi
x
"bund
l
e -
-
stdin"
s
e
g
fault
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-20
Jonathan
N
ied
e
r
t5704 (b
u
ndl
e
): add tests for bundle --
s
tdin
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 ve
r
ify-tag
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-15
Jo
n
athan Nieder
D
ocument new "already
-
merg
e
d" rule for
b
r
anch -d
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-15
Jonathan Nieder
Add
.
depen
d
directo
r
ies to
.
gitigno
r
e
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-15
Jonathan Nieder
t7006: guard cleanup with test_expect_success
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-13
J
onatha
n
Niede
r
t580
0
: testgit helper
r
equires Python support
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-11
Jon
a
than Nieder
t7400: cl
a
rify su
b
module update tests
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-11
Jonatha
n
Nied
e
r
t7
4
00: clari
f
y 'submodu
l
e add
'
tests
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-11
Jonat
h
an Ni
e
der
t7400: split
set
u
p into mult
i
ple tests
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-04
J
onathan
Nieder
Teac
h
mai
l
info %< as
an
a
l
ternative scissors mark
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-03
Jonathan Nied
e
r
Makefile:
f
u
tu
r
e-proof Cygwin version check
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jona
t
han Nieder
merge-r
e
cur
s
ive: add a la
b
e
l
for ancestor
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jon
a
tha
n
Niede
r
cherry
-
pick,
r
evert: add
a
label fo
r
ancestor
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
J
o
na
t
han
Nieder
rever
t
:
clarify
l
abel on con
f
l
i
ct
hunks
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan N
i
eder
c
ompat: add mem
p
cpy(
)
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonath
a
n
Nie
d
er
checkout -
m
--co
n
flict=diff3: add a l
a
b
e
l for ancestor
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
J
onatha
n
Nie
d
er
merge_trees()
:
add ancestor label paramet
e
r for d
i
ff3
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jo
n
athan
Nieder
me
r
ge_fil
e
(
)
:
a
d
d c
o
mme
n
t ex
p
lain
i
ng beh
a
vior wrt c
o
n
f
li
c
t
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@mgila.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonath
a
n
Nie
d
er
checkout --conflict=diff3: add a l
a
bel
f
or
a
n
cestor
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonath
a
n
Nieder
l
l
_merge():
a
dd an
c
estor l
a
b
e
l parameter for diff3
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan
N
ieder
merge-file
-
-dif
f
3
:
add a label
f
or
ancest
o
r
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
next