repo.or.cz
/
git
/
kirr.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'jk/maint-apply-no-binary' into maint
2010-08-06
Jona
t
han Nieder
ll-merge: let caller decide w
h
eth
e
r to reno
r
malize
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-06
Jona
t
han Nieder
ll-merge: make fl
a
g easier to
populat
e
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-06
Jona
t
han Nieder
Docu
m
ent
a
tion/technical: doc
u
me
n
t ll_m
e
rge
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan
Nieder
mer
g
e-trees: let caller decide whether to
reno
r
m
a
lize
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-06
Jonatha
n
Nieder
m
e
rge-tr
e
e
s
: p
u
sh choice to renormalize away f
r
om
lo
w
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan Nie
d
er
t
60
3
8 (
m
e
r
g
e
.
renormal
i
ze): chec
k
that it can be turned off
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-06
Jo
n
athan Nieder
t6038 (merge
.
r
enormalize): try checkout -m and
c
herry
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan Ni
e
de
r
t6038 (merge
.
renormalize): style nitpicks
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan Ni
e
d
e
r
diff:
s
pl
i
t off
a
functio
n
for
--s
t
at-* option parsing
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-04
Jona
t
han Nie
d
er
t41
1
1 (apply): r
e
fresh index before ap
p
l
ying patches
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-02
J
o
nathan N
i
eder
Doc
u
menta
t
ion: fl
e
sh ou
t
“git pull” desc
r
iption
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-02
J
onathan Nieder
gitweb: al
l
ow c
o
nfi
g
urations that
c
h
ange w
i
t
h e
a
ch
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-02
Jonat
h
an Nieder
t1011 (sparse ch
e
ckou
t
): s
t
yle
n
itpi
c
ks
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-27
Jonath
a
n
Ni
e
d
e
r
examples/
c
ommit: use
--abb
r
ev
for co
m
m
it summary
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-27
Jonath
a
n
Nie
d
er
checkou
t
, commit: remove confusing assignments t
o
rev
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-27
Jon
a
than Nie
d
er
a
r
c
h
ive: abbreviate substituted commit ids ag
a
in
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-27
Jo
n
atha
n
Nieder
confi
g
--g
e
t --pat
h
: check for uns
e
t $HO
M
E
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-26
Jon
a
t
han
N
ie
d
er
setup: spli
t
off get_device
_
or_die helper
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-26
Jonathan
Nieder
setup: split off a funct
i
on to handle hi
t
ting ceiling
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-26
Jonathan Nieder
setup
:
split
off cod
e
t
o handle stumbling
u
p
on a repository
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-26
Jonathan Niede
r
set
u
p: spli
t
off a funct
i
on
t
o chec
k
s w
o
rking
d
ir fo
r
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-26
Jo
n
athan Nieder
setu
p
: split off $GIT_DIR-set case from
s
etup_git_dir
e
ctory_
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-26
Jonathan
N
i
eder
tests: try git apply
f
rom s
u
bdir of to
p
le
v
e
l
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-26
Jona
t
han Nie
d
er
t1
5
01 (rev-par
s
e)
:
cla
r
ify
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-23
Jon
a
t
h
an N
i
eder
t340
0
(reba
s
e
)
: whitespac
e
c
l
e
a
nup
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-23
Jon
a
t
han Nieder
t4
1
5
0 (am):
f
utureproof against failing tests
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-23
Jon
a
than
N
iede
r
t
4150
(
am): s
t
yle fix
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-21
Jon
a
than Niede
r
t/README
:
correct an exce
p
tio
n
w
hen
breaking a && chain
.
.
.
commit
|
commitdiff
|
tree
2010-07-16
Jonathan Nieder
Add
a s
a
mpl
e
u
s
e
r for t
h
e svnd
u
mp library
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-15
Jonathan
N
i
eder
E
x
p
ort parse_date_basic() to conve
r
t a date string
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-15
Jonath
a
n Ni
e
de
r
D
o
cum
e
nta
t
ion:
add su
b
module
.
* to the big
con
f
igurat
i
on
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-15
Jon
a
than Nie
d
er
gitmodu
l
es
.
5: url ca
n
be a relative
p
ath
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-14
Jonathan Nie
d
er
git -
-
paginate:
p
agina
t
e extern
a
l command
s
agai
n
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-12
Jon
a
th
a
n Nie
d
er
t3000
(
ls-files -o): moderni
z
e sty
l
e
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-08
Jo
n
athan
Nieder
t9118 (git-svn): p
r
event early fa
i
lure fr
o
m taking
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-07
Jonathan N
i
eder
t/REA
D
ME: docum
e
nt more test
h
e
l
per
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-05
Jonathan Nieder
Tea
c
h
f
as
t
-i
m
port to import subt
r
ees named by tree id
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-29
J
onathan
N
ieder
rever
t
:
do not rebuild
ar
g
v on heap
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-28
Jonathan Nied
e
r
tests: local
c
onfig file
should be honored
from subdirs
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-28
Jonathan
N
ieder
t7006
:
test pag
e
r configuration for
several git com
m
ands
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-28
Jonath
a
n Nie
d
er
t
7
006
(pager
)
: in
t
roduce helper for parameter
i
z
e
d
tests
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-14
Jonathan Nieder
t3
5
08 (cherry-pick): fu
t
ureproof against unmerged files
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-14
Jonathan N
i
eder
git-svn: strip off leading slashes on -
-
tru
n
k argument
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-13
J
ona
t
han Ni
e
der
ad
d
-interactive
:
Clarify “rem
a
ining hunks in
t
he
f
i
le”
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-13
Jonat
h
an Nieder
grep: re
f
actor grep_object
s
l
oop
i
nto its ow
n
function
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-11
Jonat
h
an Nieder
Docum
e
nt
a
ti
o
n/checkout: clarify descrip
t
ion
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-11
Jonathan Nieder
rebase -i -p: docum
e
nt s
h
ortco
m
ings
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-02
J
o
nathan Nieder
DWIM 'git
show
-5' to 'git show
-
-do-walk
-5
'
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-01
Jo
n
athan
N
ieder
gitignore
.
5: Clar
i
fy
m
a
tc
h
ing rule
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-01
Jonat
h
a
n
Nieder
rebase: im
p
rov
e
err
o
r messa
g
e when
upst
r
eam argument
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-01
Jonathan Nieder
Documenta
t
ion
/
che
c
kout:
c
larif
y
description
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-28
Jo
n
atha
n
N
i
e
der
fsck: f
i
x
bo
g
u
s commit head
e
r c
h
ec
k
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-20
Jonathan Nieder
Add gi
t
remote
s
e
t
-bra
n
ch
e
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-20
Jonat
h
an Nieder
p
ost-receive-email: document c
o
mmand-line
m
ode
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jona
t
han Ni
e
der
git svn: a
v
o
id
u
n
i
n
itialized
var in 'reset'
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Nieder
Makefile: let
h
eader
dependency c
h
ecker override CO
M
PUTE_HEA
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jo
n
athan Nie
d
er
Makefil
e
: fix head
e
r de
p
endency checker to
a
llow
N
O_CURL
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
J
o
n
a
than
N
ieder
Docume
n
tation/notes: ni
t
picks
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Nie
d
er
Do
c
umentation/notes: cle
a
n up de
s
cription of
rewri
t
i
ng
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jo
n
athan Niede
r
Documentati
o
n/no
t
e
s
: simplify
treatment of
defau
l
t
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jo
n
athan Nieder
D
o
cument
a
tion/log: add a C
O
NFIGURATION sect
i
on
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Nieder
Documentation/
n
o
t
es: simplify trea
t
m
ent of default
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan
N
ieder
Documentati
o
n
/
n
o
tes: add configuration
s
ection
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan
N
i
e
d
e
r
Documentation/not
e
s:
d
escribe conte
n
t of
n
o
t
es blobs
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Nieder
Documentation/notes
:
docu
m
ent form
a
t of notes trees
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-08
Jonathan Nieder
cherry-
p
i
c
k
: d
o
not du
m
p core
when iconv fails
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-08
J
onathan Nieder
p
r
e
tty: ini
t
ialize new cmt_fmt_map t
o
0
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-08
Jonath
a
n Nieder
a
da
p
t request-
p
ull te
s
ts for ne
w
pull
request
format
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-06
J
ona
t
ha
n
Nieder
te
s
t-lib: some shells do no
t
l
e
t
$?
p
ropagate
i
nto
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jonath
a
n Nieder
shortlog: Docume
n
t
a
nd test --for
m
at
o
p
tion
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jonathan Nieder
t4201 (shortlog): Test outp
u
t format with mu
l
tip
l
e
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jon
a
t
han N
i
ed
e
r
t4201 (shor
t
log
)
: g
u
ard set
u
p with test_expect_
s
uccess
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jonat
h
a
n Nieder
Documenta
t
io
n
/shortlog: script
e
d u
s
ers shoul
d
not rely
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jonath
a
n
Nieder
commit --amend: co
p
e
w
ith mi
s
sing
d
isplay name
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jonathan Nieder
test-lib:
L
et tests
s
pecify
c
o
m
mand
s
t
o
b
e
run at
e
nd
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-01
Jonathan Nieder
fsc
k
: check
i
den
t
l
i
nes in commit objects
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-01
Jonathan Nied
e
r
request-p
u
ll: protect
a
g
ai
n
st OPTIONS_KEEPDASHDASH
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-01
Jonatha
n
N
i
e
d
er
t
est
s
f
o
r
r
e
quest-
p
ull
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-22
J
o
n
a
tha
n
Nieder
Documenta
t
ion/Makefile:
fix inte
r
rupte
d
builds of user
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-20
Jonathan Nieder
fix "bund
l
e
-
-
stdin" segfault
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-20
Jonathan Nieder
t
5
704 (bundle):
a
dd tests
f
or bundle --s
t
din
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-17
Jonathan Nieder
tag -v
:
use RUN_GIT_CMD
t
o run verify-tag
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-15
Jonat
h
an Nieder
Docu
m
ent new "alre
a
d
y-merged" rule for branch -d
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-15
Jonathan Ni
e
der
Add
.
depend
di
r
e
c
tories to
.
git
i
gnore
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-15
Jonathan Nieder
t7006: guard
c
le
a
n
u
p
with test_ex
p
ect_s
u
cc
e
ss
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-13
J
o
nathan Nieder
t5800: testgit he
l
p
e
r requires Pyth
o
n
s
upport
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-11
J
onathan
N
ieder
t7
4
00: cla
r
ify
submodule
u
pdate
tests
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-11
Jonathan Nieder
t740
0
: c
l
a
r
ify 'su
b
module add' te
s
ts
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-11
J
o
n
athan Nieder
t7400: spl
i
t
setup int
o
multiple
t
est
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-04
Jonathan Nieder
Teach mailinfo
%
< as an alterna
t
ive scissor
s
m
a
rk
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-03
Jonathan Niede
r
Make
f
i
le: fut
u
re-
p
r
o
o
f Cygwin ver
s
ion check
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
J
o
nathan Nied
e
r
m
erge-rec
u
rsiv
e
:
a
d
d
a label for ancestor
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan
N
ieder
cherry
-
pick,
rev
e
rt:
a
dd a
l
a
bel for a
n
cestor
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nied
e
r
revert: c
l
ari
f
y label on conflict hunks
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Ni
e
der
compat:
a
d
d mem
p
cpy()
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
chec
k
out -m -
-
conf
l
ict
=
d
iff3
:
a
dd a label for ancestor
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
m
e
rge_t
r
ees(): add
a
nce
s
to
r
label parameter for diff3
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan
N
i
e
der
m
erge_file():
a
dd comment expla
i
n
i
ng beh
a
vior wrt conflict
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@mgila.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Niede
r
chec
k
out --conflict=di
f
f3:
a
d
d a label fo
r
ancestor
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
ll_
m
er
g
e(): add ance
s
t
or
l
ab
e
l parameter
f
or
d
iff3
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
next