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
Merge branch 'maint'
2010-08-24
Jonathan Nied
e
r
pa
r
se-opti
o
ns: cl
a
rif
y
PARS
E
_OPT_NOAR
G
descript
i
on
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-24
Jonathan
N
ieder
t
3302 (notes): P
o
r
t to Solaris
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-12
J
o
nathan Nieder
Standardize do {
.
.
.
} while (0) style
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-11
Jonath
a
n Nie
d
er
wri
t
e-tree: Avoid le
a
k when
i
n
d
ex refers to an inv
a
l
i
d
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-11
Jonathan Nieder
read-tree: s
t
op
l
ea
k
ing tree ob
j
e
c
ts
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-11
Jona
t
h
a
n Nied
e
r
core:
S
top leaking on
d
i
sk_cache_e
n
trys
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-09
Jonath
a
n Nieder
gitweb: cl
a
ri
f
y sear
c
h results
page whe
n
no m
a
tching
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-09
Jonathan Nieder
Documen
t
a
t
ion: add a FIL
E
S se
c
tion for show-ref
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-09
Jonat
h
a
n
N
i
eder
Ma
k
efil
e
: add mi
s
sing
d
e
pendency on h
t
tp
.
h
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-09
Jonathan Nieder
Makefile: add missing depende
n
cies
o
n
u
rl
.
h
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan Nieder
Allow
"check-
r
e
f-form
a
t --b
r
a
n
ch" from
subdirecto
r
y
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-06
Jo
n
athan Niede
r
check-r
e
f-format: ha
n
d
l
e
subcommand
s
in
separa
t
e funct
i
ons
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-06
Jon
a
than Ni
e
de
r
diff: split
off a function for --
s
tat-*
o
pti
o
n parsing
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-02
J
on
a
than Nieder
Documentation: f
l
esh out “git pull
”
descript
i
on
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-02
Jona
t
han Ni
e
der
gitweb
:
a
llow configurations
t
hat change
wit
h
e
a
ch
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-02
Jonathan Nie
d
er
t1011 (sparse c
h
eckout)
:
style nitpicks
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-27
Jonathan Nieder
ex
a
mpl
e
s/commit: use --abbrev for commit su
m
m
a
r
y
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-27
J
o
n
atha
n
Niede
r
ch
e
cko
u
t, commit: remove confus
i
ng a
s
sig
n
ments t
o
re
v
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-27
Jon
a
than N
i
eder
ar
c
hive: abbreviate su
b
stituted commi
t
ids again
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-27
Jonathan N
i
eder
config --get -
-
path: check for
u
n
set $HOME
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-23
Jonathan Nieder
t340
0
(rebase)
:
whi
t
e
space cleanup
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-23
Jonatha
n
Ni
e
der
t41
5
0
(am): futureproof against f
a
iling tests
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-23
Jonathan Nieder
t
4150 (am):
s
tyle fi
x
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-21
Jonathan Nieder
t/README: correct
a
n exception whe
n
breaking a &&
c
hain
.
.
.
commit
|
commitdiff
|
tree
2010-07-16
J
o
nathan Nieder
Add
a s
a
mple us
e
r for the svndump library
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-15
Jonathan Ni
e
der
Export
p
a
rse_date_
b
a
si
c
() to convert
a date str
i
ng
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-15
Jonat
h
an Niede
r
Doc
u
ment
a
tion: add sub
m
odule
.
* to the big co
n
figuration
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-15
Jona
t
han Nieder
gitmodules
.
5: ur
l
can be
a
relative path
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-14
Jonathan Nied
e
r
gi
t
--pag
i
nate: pagin
a
t
e
ext
e
r
nal comman
d
s a
g
a
i
n
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-12
Jonathan
Nie
d
er
t3000 (ls-files -
o
): m
o
dernize style
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-08
Jonath
a
n Ni
e
d
e
r
t9118 (git-svn):
p
reve
n
t ea
r
ly failu
r
e from takin
g
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-07
Jonathan Nieder
t/README: doc
u
ment mo
r
e test helpers
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-05
Jonatha
n
Niede
r
Teach fa
s
t-import to import subtre
e
s
n
a
med by tre
e
id
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-29
J
ona
t
han Nieder
reve
r
t
:
do not rebu
i
ld arg
v
o
n
h
e
ap
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-28
Jonathan Nieder
tests: local config file should be honored from
subdirs
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-28
Jonathan
Nieder
t7006:
test p
a
ger c
o
n
f
i
g
uration for
s
e
v
e
r
al git commands
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-28
Jonath
a
n N
i
ed
e
r
t7006 (pager):
i
ntroduce helper for parameteriz
e
d tests
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-14
Jonathan Niede
r
t3508 (c
h
e
r
ry-pi
c
k): futu
r
eproof against u
n
me
r
ge
d
files
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-14
Jonathan Nieder
g
i
t-s
v
n: strip
o
ff le
a
di
n
g slas
h
es on --trunk argument
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-13
J
o
nathan Nieder
add-int
e
racti
v
e: Clarify “re
m
a
i
n
ing hu
n
ks in the fi
l
e”
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-13
Jonathan Nieder
grep:
refactor grep_ob
j
ects loop
into it
s
own
f
u
n
ction
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-11
Jonathan Nieder
Documentation/chec
k
out: clarify descriptio
n
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-11
Jonat
h
a
n N
i
eder
reb
a
se -i
-
p
: document short
c
omi
n
gs
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-02
J
o
n
a
t
han
N
i
eder
DWIM 'gi
t
s
h
o
w -5' to
'
git show --
d
o-w
a
l
k
-5'
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-01
J
o
nat
h
an Nie
d
er
gi
t
ignor
e
.
5: Clarify m
a
tc
h
in
g
rules
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-01
J
ona
t
han N
i
eder
rebas
e
: impr
o
ve error m
e
s
sage when up
s
t
r
eam arg
u
ment
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-01
Jonathan Nieder
Doc
u
mentation/checkout: clarify
d
e
scriptio
n
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-28
Jonathan Nie
d
er
f
s
ck: fix bogus co
m
mit hea
d
er check
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-20
Jonathan
N
ieder
Add git remote set-
b
ranch
e
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-20
Jonathan N
i
eder
post-receive-email: d
o
c
ument
c
o
m
mand-
l
ine mod
e
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan
N
ieder
git s
v
n:
avoi
d
uni
n
i
tializ
e
d v
a
r in 'res
e
t'
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Nieder
Makefil
e
: let hea
d
er de
p
end
e
ncy checke
r
override COMPUTE_HEA
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Nieder
Makefile
:
fix
h
eader depend
e
nc
y
ch
e
c
k
er to allow NO_CURL
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonat
h
a
n
Nieder
Documentation/notes: ni
t
pi
c
ks
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonath
a
n Nieder
Document
a
t
ion/
n
ote
s
: 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
Jonathan Nieder
Documen
t
a
t
io
n
/not
e
s: simpli
f
y treatme
n
t of default
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
J
o
nathan Nie
d
er
D
ocument
a
t
i
on/log:
ad
d
a
C
ON
F
IG
U
RATION
secti
o
n
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Nieder
Documentation/notes: simpl
i
f
y
t
reatment of default
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jo
n
athan Nieder
Documen
t
a
tion/notes:
ad
d
configuration se
c
tion
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Nied
e
r
Docume
n
t
ation/notes: des
c
ribe co
n
t
e
nt of notes blobs
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
J
onathan Ni
e
der
Documentati
o
n/not
e
s: document form
a
t
of n
o
tes
t
r
e
es
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-08
J
o
n
ath
a
n
N
ieder
cherr
y
-pick: do not
dump core
w
hen
iconv fails
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-08
J
o
nath
a
n Ni
e
der
pretty: initialize new cmt_f
m
t_map to
0
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-08
Jonathan Nied
e
r
adap
t
request-pull tests for n
e
w
pull reque
s
t format
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-06
Jonathan
Nieder
test
-
l
ib: some shells do no
t
let $? propagate into
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jonathan Ni
e
der
shortlog: Document
and test
--format
o
ption
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jonathan
N
i
ed
e
r
t4
2
01 (short
l
og):
Test outpu
t
format with mul
t
i
p
l
e
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jonathan Nieder
t
4201 (shortlog
)
: gua
r
d setup w
i
t
h
test_expe
c
t_success
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jona
t
ha
n
Nieder
Documentati
o
n/
s
hortlog:
s
cripted
u
s
e
rs should n
o
t
re
l
y
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jonath
a
n Nied
e
r
c
o
mmit --amend: cope
w
ith
missing display n
a
me
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
J
o
nathan Nie
d
er
test-
l
ib: Let tests s
p
ecify commands to
b
e
r
u
n at
end
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-01
J
o
n
ath
a
n
N
ieder
fsck: check ident
li
n
es in co
m
mit objects
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-01
Jonath
a
n Nied
e
r
r
e
qu
e
s
t
-
pu
l
l: protect against OPTIONS_KE
E
PDASHDASH
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-01
Jon
a
tha
n
Nieder
tes
t
s for request
-
pull
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-22
Jon
a
than Ni
e
d
er
Documentation/M
a
kefile: fi
x
int
e
r
rup
t
ed
b
u
ilds of use
r
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-20
Jonathan Nieder
fix "bu
n
dle --stdin" seg
f
ault
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-20
J
onatha
n
Ni
e
der
t5704 (bundl
e
): add
tests
f
or bundle
--stdin
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-17
Jonat
h
an Nieder
tag -v: use RUN_GIT_CMD to
r
u
n
verify
-
tag
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-15
Jonathan Nieder
Document new "
a
lready-merged
"
r
ule for branch -d
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-15
Jonathan Ni
e
der
A
d
d
.
depend d
i
rectori
e
s to
.
git
i
gno
r
e
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-15
Jonat
h
an Ni
e
der
t
7006:
g
u
ar
d
cl
e
anup with test_exp
e
ct_success
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-13
Jonathan
N
ieder
t580
0
:
test
g
it helpe
r
requires Python sup
p
ort
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-11
Jonathan Nieder
t
7
400: cla
r
ify submodule
up
d
at
e
tests
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-11
Jonat
h
an Nieder
t7400: cl
a
ri
f
y 'subm
o
du
l
e add
'
tests
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-11
Jonathan Niede
r
t7400: split set
u
p
into m
u
ltiple te
s
ts
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-04
Jo
n
at
h
an
N
ieder
T
each
m
aili
n
fo %< as an alternative scis
s
ors mark
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-03
Jo
n
ath
a
n Nieder
Makef
i
l
e: future-p
r
oof Cygwin versi
o
n che
c
k
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nied
e
r
merge-rec
u
rsiv
e
: add a
lab
e
l
f
o
r
a
nces
t
or
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nied
e
r
cherry-pi
c
k
, revert: add a label for
ancesto
r
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
revert: clar
i
fy l
a
b
e
l on co
n
f
l
ict hunks
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
J
ona
t
han Nieder
compat:
add
m
empcpy()
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jon
a
than N
i
ede
r
che
c
kou
t
-m --
c
onflict=d
i
ff3: a
d
d a label
f
or ance
s
to
r
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
merg
e
_trees(): add ancestor label paramete
r
for dif
f
3
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonath
a
n N
i
eder
me
r
ge_file(): add comment explaining behavior w
r
t
c
onflic
t
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@mgila.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonat
h
a
n Nieder
c
h
eckout --conflict=diff3: add a label
f
or an
c
es
t
or
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan
N
ieder
l
l_merge(): add
ancestor label parameter for di
f
f3
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonatha
n
Ni
e
d
e
r
merg
e
-file --diff3: add a l
a
b
e
l for ancestor
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonatha
n
N
ieder
xdl_merge(): move file1 and
file2 labe
l
s to xm
p
aram
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
xdl_merge(): add optional
ancest
o
r l
a
bel to diff3-style
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan
N
ieder
tests: documen
t
cherry-pick
b
e
havior in face
o
f conf
l
icts
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
next