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
cvsimport: partial whitespace cleanup
2010-08-06
Jonathan Nieder
l
l
-
merge: make flag e
a
sier to pop
u
l
a
te
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-06
J
o
nat
h
an Nieder
Documentation/technical: document ll_merge
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan N
i
eder
mer
g
e-tr
e
es:
l
et
c
al
l
e
r
decide whether
to renor
m
ali
z
e
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan Nied
e
r
merge-trees: push c
h
oice
t
o
ren
o
rmalize
a
w
a
y from low
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-06
J
onathan Nieder
t60
3
8 (merge
.
renormalize): check that it
ca
n
be turned
o
ff
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-06
J
o
nat
h
a
n
N
ieder
t6038 (me
r
ge
.
renormalize): t
r
y
c
he
c
ko
u
t -m and ch
e
r
r
y
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan Nieder
t6038 (mer
g
e
.
ren
o
rmalize): style ni
t
p
i
c
k
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan Nieder
diff
:
spli
t
off a function for --st
a
t
-
* option parsing
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-04
Jonathan Nied
e
r
t4
1
11 (app
l
y): refresh in
d
ex
b
efore a
p
p
l
y
ing pa
t
ches
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-02
J
onathan
N
ieder
D
o
cumenta
t
ion: flesh
o
ut “g
i
t pu
l
l” descript
i
on
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-02
J
onathan Nieder
git
w
e
b
:
allow confi
g
ura
t
i
ons that chan
g
e with each
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-02
Jonathan Nieder
t10
1
1
(sparse c
h
eckout
)
: sty
l
e nitpicks
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-27
Jonathan
Nieder
exam
p
les/c
o
mmi
t
: use
--
a
bb
r
ev
f
or commit
s
umma
r
y
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-27
Jo
n
a
than Nieder
checkout, co
m
mit
:
remove confu
s
ing assi
g
nm
e
n
t
s to
rev
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-27
Jonatha
n
Nieder
archive
:
abbreviate
s
u
b
st
i
tute
d
com
m
it ids again
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-27
Jonathan Nieder
config --get --path: check fo
r
unset $H
O
ME
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-26
Jo
n
athan Nieder
setup: split o
f
f
g
et_device_or_die h
e
l
p
e
r
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-26
Jonathan Nieder
setup: sp
l
it off a function to
h
andle hitting ceiling
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-26
J
o
nat
h
a
n
Ni
e
de
r
setup: split off code to handle stumblin
g
upon a repository
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-26
Jonathan Nied
e
r
s
e
t
u
p
: spl
i
t off a function to che
c
ks
w
orking dir for
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-26
Jonathan
Nie
d
er
s
e
tup:
split off
$
GIT_D
I
R
-
se
t
case
f
rom se
t
up_git_direc
t
ory_
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-26
Jonathan Nieder
tests: try git apply from sub
d
ir of t
o
plevel
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-26
Jonathan Nieder
t15
0
1 (rev-parse
)
: clar
i
f
y
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-23
J
o
nathan Nieder
t3400 (r
e
base): whitespace c
l
e
anup
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-23
Jonathan Nied
e
r
t4150
(
am): futureproof
against failing tests
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-23
Jonathan Nieder
t4150 (am)
:
s
t
y
le f
i
x
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-21
Jo
n
athan
N
ieder
t/README: correct an exception w
h
en breaking a && chain
.
.
.
commit
|
commitdiff
|
tree
2010-07-16
Jonath
a
n Ni
e
de
r
Add a sam
p
l
e
u
s
e
r for the svndum
p
l
i
b
r
a
ry
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-15
Jona
t
h
an
Nieder
Export parse_date_basic() to convert
a date s
t
r
ing
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-15
J
o
nathan Nieder
Do
c
umen
t
ation:
add submodu
l
e
.
* to the
b
ig conf
i
guratio
n
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-15
J
onathan
Nieder
gitmodules
.
5: url can be a rel
a
t
i
ve
path
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-14
Jonat
h
a
n
N
i
eder
g
i
t -
-
pag
i
nate: paginate external commands a
g
ain
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-12
Jonat
h
an Nieder
t3000 (l
s
-files -o):
mo
d
ernize
s
tyle
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-08
Jonathan Nieder
t
9
11
8
(git-sv
n
)
: p
r
e
vent
e
arly fail
u
r
e
f
r
om taking
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-07
Jonathan Ni
e
der
t/README: do
c
um
e
nt
m
ore test
helpers
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-05
Jonathan
Nieder
T
e
a
c
h fa
s
t-import to
i
mport subtrees named by tree id
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-29
Jonathan Nie
d
er
reve
r
t: do n
o
t
rebu
i
ld argv on
h
e
a
p
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-28
Jona
t
han Nieder
tests: loc
a
l config
file shou
l
d
be honored from subdi
r
s
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-28
Jo
n
athan Nieder
t7006: te
s
t
pa
g
er c
o
nfiguration for seve
r
al
git
commands
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-28
Jonathan
N
ieder
t
7
0
0
6 (pager):
i
ntroduce helper for parameter
i
zed
t
e
sts
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-14
Jonathan N
i
eder
t3508 (cherr
y
-pi
c
k):
f
u
t
u
r
eproof against unmerged files
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-14
Jonat
h
an Nie
d
er
gi
t
-svn:
s
trip off leading
s
lashes on --trunk argument
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-13
Jonat
h
an Nieder
a
d
d-int
e
ra
c
tive: Clarif
y
“r
e
mai
n
i
n
g hunks in the file”
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-13
Jonath
a
n
Nieder
grep: refactor
g
re
p
_ob
j
ec
t
s loop into
i
ts own function
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-11
J
onathan
Nieder
D
ocumentati
o
n/checkout:
cl
a
rify
desc
r
iption
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-11
Jonathan Nieder
rebase
-
i
-p: do
c
u
ment
s
h
ortcomings
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-02
Jonath
a
n Nieder
DWIM
'
g
it
show -5' to '
g
it s
h
ow --do-wa
l
k -5'
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-01
Jonathan N
i
eder
gitignore
.
5: C
l
ari
f
y matching
r
ules
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-01
Jonathan
N
ie
d
er
rebase: improve
error messa
g
e when upst
r
ea
m
arg
u
me
n
t
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-01
Jonathan Nied
e
r
Documentation/c
h
eckout: c
l
arify description
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-28
Jo
n
athan N
i
eder
f
s
ck: fi
x
bo
g
us commit heade
r
check
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-20
Jonathan Nied
e
r
A
dd gi
t
re
m
o
t
e set-b
r
anches
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-20
Jona
t
h
an Nieder
post-receive-email:
d
ocument
c
o
mman
d
-line mode
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonat
h
an Nieder
g
i
t svn:
avoid uninitia
l
ized var in 're
s
et'
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Nieder
Mak
e
f
ile: le
t
h
e
ader
dependency checker
over
r
ide COMP
U
TE_HEA
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan N
i
eder
Makefile: fix h
e
ader dependency checker
t
o
a
llow NO_CURL
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonatha
n
N
ieder
Docu
m
entation/notes: nitpicks
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jo
n
athan Nieder
Do
c
ume
n
tation/notes: cl
e
an
up description
o
f
rewritin
g
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jo
n
at
h
an Nie
d
e
r
D
o
cument
a
t
ion
/
notes
:
s
implify treat
m
e
nt of defaul
t
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonat
h
an Nied
e
r
Docum
e
ntation/lo
g
: add a
C
O
N
FIGURATION section
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jon
a
t
han
Nie
d
e
r
Documen
t
ation/not
e
s: simplify
tre
a
tment of de
f
ault
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
J
o
nathan Nieder
D
o
cumentati
o
n/no
t
e
s
: add co
n
fi
g
uration
s
e
ction
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jona
t
han Nieder
Doc
u
mentation
/
n
otes: descri
b
e content of notes blobs
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Nieder
Doc
u
mentation/notes:
d
ocument format of notes trees
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-08
Jonathan
N
ieder
cherry-pick: do not
dum
p
co
r
e
when icon
v
fails
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-08
Jonathan N
i
eder
pretty: i
n
itiali
z
e ne
w
cm
t
_fmt_map to
0
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-08
J
o
nathan
N
ieder
adapt request-pull tes
t
s for
new pull requ
e
st format
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-06
Jonath
a
n Nieder
test-l
i
b: so
m
e shells do not let $? propaga
t
e into
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jo
n
athan Nieder
shortlog
:
D
o
cument
a
nd
t
est --format o
p
t
i
on
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jonathan Nieder
t4201 (
s
h
ortlo
g
): Test output for
m
at
w
i
t
h
m
ultiple
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jonathan
N
ieder
t4201 (shor
t
log):
g
u
ard setup with test
_
expect_success
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jonathan Nieder
Document
a
ti
o
n/s
h
ortlog: scr
i
p
ted users should not re
l
y
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jonathan
N
i
eder
commit --am
e
n
d: cope with mis
s
i
n
g display
name
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jonathan Nie
d
e
r
tes
t
-lib: Let tests speci
f
y c
o
mmands to be r
u
n
a
t end
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-01
Jonathan Nied
e
r
f
sck: ch
e
ck ident lines i
n
commit o
b
jects
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-01
J
o
nat
h
an Ni
e
der
request-pull: protec
t
against OPTIONS_KEE
P
D
A
SHDASH
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-01
J
o
n
athan N
i
eder
tests
for re
q
ue
s
t-p
u
ll
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-22
Jonatha
n
Nieder
D
ocumentation
/
Makefile: fix interrupted b
u
ild
s
of user
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-20
J
o
nathan Nieder
f
i
x
"bu
n
dle --stdin" segfault
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-20
Jonathan
N
ieder
t5704 (bundl
e
): add
test
s
for bun
d
le
-
-stdin
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-17
Jona
t
han
N
ieder
tag -v: use RU
N
_GIT_CMD to run verify
-
tag
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-15
Jonathan Nieder
D
ocument new "already-merged
"
rule
f
o
r
branc
h
-
d
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-15
Jona
t
han Nieder
Add
.
de
p
en
d
directories to
.
git
i
gnore
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-15
J
o
nath
a
n Nie
d
er
t7
0
06: guar
d
cleanup with test_expect_succ
e
ss
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-13
Jonathan Nie
d
er
t
5
800: test
g
it
h
elper
requi
r
e
s
Pyth
o
n
suppor
t
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-11
Jonat
h
an Nieder
t7400: cl
a
rify submodule upd
a
te tests
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-11
Jonathan Nieder
t
7400: c
l
a
r
ify 'submodule
a
d
d' tests
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-11
Jon
a
tha
n
Nieder
t7400: split s
e
tup
i
nto multiple test
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-04
Jonat
h
an
N
ieder
Teach mailinfo %
<
a
s an
alterna
t
ive sci
s
sors mark
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-03
Jonathan Nieder
Make
f
ile: future-proof Cyg
w
in version check
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonath
a
n Nie
d
er
m
e
r
g
e
-rec
u
rsive: add
a l
a
b
el for ancestor
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonatha
n
Ni
e
der
cherry-pick, revert: add
a
l
a
bel for ancestor
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
J
o
nath
a
n
N
ieder
revert
:
clarify label on conf
l
i
ct hunks
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jo
n
a
than Nieder
co
m
pat:
a
dd mem
p
cpy()
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
J
ona
t
han Niede
r
checkout -m
-
-
conflict=d
i
f
f
3: add a label for ancestor
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
merge_trees(): add
a
n
c
estor
label parameter
f
o
r diff3
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
J
o
nath
a
n Nieder
m
e
rge
_
file(): add comment
explaining behavior wrt conflict
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@mgila.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonatha
n
N
ie
d
er
checkout --conflict=d
i
ff3
:
add a label for ancestor
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
J
onathan Nieder
ll_merge()
:
add
ancestor
l
abel pa
r
ameter for d
i
ff3
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan
N
i
e
d
e
r
merge-f
i
l
e
--diff3:
a
dd a
label for ance
s
to
r
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
next