repo.or.cz
/
git
/
dkf.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Documentation: diff can compare blobs
2010-08-06
Jona
t
han
N
ie
d
er
m
e
rge-trees: push
c
hoice
t
o renormalize away from low
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-06
J
o
nathan Niede
r
t6
0
38 (merge
.
renormalize):
ch
e
ck that it can be turned off
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-06
Jo
n
athan N
i
eder
t6038 (merge
.
renorma
l
ize): try check
o
ut -m and cherr
y
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan Niede
r
t6038 (
m
erge
.
renorma
l
ize
)
: style
n
i
t
picks
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-06
J
onat
h
an Ni
e
der
d
i
ff:
s
plit off
a
f
unction for -
-
sta
t
-
*
o
p
tion par
s
ing
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-04
Jon
a
th
a
n Nied
e
r
t4111
(
apply): ref
r
esh in
d
e
x before apply
i
ng patches
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-02
J
on
a
than Nieder
D
o
cum
e
ntation:
f
l
e
sh out “git p
u
ll” descri
p
tion
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-02
Jonat
h
an Nieder
g
i
t
web: a
l
low config
u
rations that change w
i
th
each
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-02
Jonathan Nie
d
er
t1
0
11 (sp
a
r
s
e checko
u
t):
style
n
itpick
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-27
Jonathan Nied
e
r
examples/commit: use --
a
bbre
v
for commit sum
m
ary
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-27
J
o
na
t
h
a
n
Nied
e
r
checkout, commit: rem
o
v
e
confusing as
s
ignments to rev
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-27
Jonathan Nied
e
r
arc
h
ive: abbrev
i
ate substituted commit i
d
s a
g
ain
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-27
Jonathan
N
i
e
d
er
config --get
-
-
path: check
for unset $HOME
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-26
Jonatha
n
Nieder
setup: s
p
l
it off get_de
v
i
ce_or_die helper
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-26
Jonathan N
i
eder
se
t
up: split off a function to han
d
l
e hit
t
ing
c
e
i
ling
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-26
Jonat
h
an N
i
eder
setup: split off code to hand
l
e
s
t
u
m
bling upon
a
reposi
t
o
r
y
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-26
Jonatha
n
N
i
e
der
setup:
s
plit off
a function to c
h
ecks worki
n
g dir for
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-26
J
o
nathan Nied
e
r
setup: split off $GIT_DIR-
s
et case
f
rom setup_git_di
r
e
ctory
_
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-26
Jon
a
than Nieder
te
s
ts: try git ap
p
ly from
s
ub
d
ir of topl
e
vel
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-26
Jo
n
athan Nieder
t
1
501 (rev-parse): clari
f
y
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-23
Jonathan Nieder
t3
4
00 (rebase
)
: whitespace cleanup
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-23
J
onathan
Nieder
t4150 (
a
m
)
: futu
r
eproof against
f
ail
i
ng test
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-23
Jonath
a
n Niede
r
t4150
(
am): style fix
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-21
Jona
t
han
N
iede
r
t/README:
correct
an exception when
breakin
g
a && chain
.
.
.
commit
|
commitdiff
|
tree
2010-07-16
Jona
t
han Nie
d
er
Ad
d
a sample us
e
r
for the sv
n
dump library
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-15
Jonathan N
i
eder
E
x
port
p
arse_date_basi
c
() to
c
onvert a d
a
te
string
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-15
Jonathan Nieder
D
ocum
e
n
tation: add subm
o
dule
.
* to the bi
g
configuration
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-15
Jonathan Nieder
gitm
o
dule
s
.
5
:
url can be a relative
p
ath
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-14
J
o
nathan Nieder
gi
t
--paginate: pagina
t
e ex
t
e
rnal command
s
again
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-12
Jonathan Nieder
t3000 (ls-fil
e
s -
o
): mod
e
rnize style
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-08
J
o
nathan Nieder
t9118
(git-
s
vn): pr
e
ven
t
early
failure from takin
g
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-07
Jon
a
than Nieder
t/READ
M
E: document m
o
re te
s
t
h
elpers
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-05
Jo
n
athan Ni
e
der
Teach fast-import to
import subtrees
na
m
ed by
t
ree id
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-29
Jonathan Nied
e
r
revert: do not
re
b
uild argv o
n
heap
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-28
Jonatha
n
Nieder
tes
t
s: l
o
cal config f
i
le s
h
o
u
l
d be honor
e
d
f
rom
s
ubdir
s
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-28
Jonathan Ni
e
der
t
7006: test
pager configu
r
ation for several g
i
t commands
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-28
Jonathan Nied
e
r
t700
6
(pa
g
er): int
r
oduc
e
hel
p
er f
o
r parameterized tests
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-14
Jonath
a
n Nie
d
er
t35
0
8 (cher
r
y-p
i
c
k
): futureproof ag
a
inst unm
e
rge
d
file
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-14
Jonathan N
i
eder
git-svn:
strip off leading
slashe
s
on -
-
trunk argum
e
nt
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-13
Jonathan Nieder
add-int
e
ractive: Clarify “remaining
hunks in the file”
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-13
J
o
nathan N
i
eder
g
rep: refa
c
tor gr
e
p_
o
bje
c
ts loop into its own funct
i
on
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-11
Jonathan Niede
r
Do
c
umentation/checkout: clari
f
y descripti
o
n
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-11
Jonathan Nieder
r
e
b
a
se -i -p: docu
m
ent short
c
omings
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-02
J
ona
t
han N
i
eder
DWIM 'git sh
o
w -5' to 'git show -
-
do-walk -5'
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-01
Jonathan Nieder
gitignore
.
5:
C
larify m
a
tching rules
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-01
Jonathan Nie
d
e
r
r
ebase:
imp
r
ove error message when up
s
tream arg
u
ment
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-01
Jonathan Nieder
Documentation/check
o
ut:
c
larify
description
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-28
Jonat
h
an Nieder
fsc
k
: fix
b
o
g
us commit header
c
h
eck
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-20
Jon
a
t
h
an Nieder
Ad
d
git re
m
o
t
e set-br
a
nch
e
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-20
Jonathan N
i
eder
post-receive-e
m
ail: do
c
u
m
e
nt command-lin
e
mode
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jo
n
athan Nieder
git svn:
a
v
o
i
d u
n
initialized var in 'reset'
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonatha
n
Nieder
Make
f
ile
:
let header dependenc
y
check
e
r
override COMPUTE_HEA
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Ni
e
der
Makefile: fix header dependency che
c
ker
t
o allow
NO_CURL
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jo
n
athan N
i
eder
Documentation/no
t
es: n
i
tpicks
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
J
o
nat
h
an
N
ieder
Documentation/notes
:
cl
e
an
up description of rewr
i
ting
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
J
onathan Nieder
Docu
m
entation
/
notes: simplify
t
reatment of defau
l
t
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan
Niede
r
Docum
e
ntation/l
o
g
: add a CONFIGURATION section
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Nieder
Doc
u
ment
a
t
ion/notes: simpl
i
fy tre
a
tment of defa
u
lt
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
J
onathan Nieder
Documentation/
n
ot
e
s:
add co
n
f
i
gur
a
tion section
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Ni
e
d
e
r
Documentati
o
n
/note
s
: describe con
t
ent of notes bl
o
bs
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Nieder
Docume
n
tation/notes: document
f
ormat of notes trees
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-08
Jonathan
N
ieder
c
herry-
p
i
c
k
:
d
o not dump core wh
e
n ico
n
v
fails
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-08
Jonathan
Nie
d
er
pretty: initialize new
cmt_
f
mt_
m
ap to 0
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-08
Jonat
h
an
Nie
d
er
adapt requ
e
st-p
u
ll tests for new pull
r
equest format
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-06
Jonathan Nied
e
r
test-lib: som
e
s
hells do not let $?
p
ropagate i
n
to
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jonathan Nieder
shortlog: Document a
n
d te
s
t --f
o
rmat option
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jonathan Nieder
t4201 (sho
r
tlog): Test out
p
u
t
format with multiple
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jonathan Nieder
t42
0
1 (shortlog): guard setup with test_expect_success
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jona
t
han
Nieder
Documentatio
n
/sho
r
tlog: sc
r
i
p
ted us
e
rs
should n
o
t rely
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jonathan Nieder
co
m
mi
t
-
-
a
mend: cope with missing displa
y
n
a
me
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jonathan Nieder
test-lib: Le
t
tests specif
y
c
o
mmands to be
r
un at end
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-01
Jonathan Nie
d
er
fsck: ch
e
ck ident l
i
nes in commit
obj
e
cts
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-01
Jonath
a
n Nieder
reques
t
-pull: p
r
o
tect again
s
t OPTI
O
NS_KEEPD
A
S
HD
A
SH
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-01
Jonath
a
n Nieder
tests for
r
equest-pu
l
l
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-22
Jonatha
n
N
ieder
Documentation/Makefile: fix interrupted builds of user
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-20
Jonathan Nied
e
r
fix "bundle
-
-stdin" segfa
u
lt
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-20
Jonathan Nieder
t5704 (bundle): ad
d
tests for
b
und
l
e --stdin
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-17
J
ona
t
han Nieder
tag
-
v: use RUN_GIT_CMD to
r
un
ver
i
fy-tag
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-15
Jonathan Nieder
Document
n
ew
"
a
lready-
m
erged"
r
ule f
o
r branch -d
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-15
Jonat
h
a
n
N
i
e
der
Add
.
depe
n
d direc
t
ories
to
.
gitigno
r
e
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-15
Jonath
a
n Nieder
t7006:
g
uard
cleanup with tes
t
_
e
xp
e
ct_s
u
ccess
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-13
Jonathan
N
i
eder
t5800: testgi
t
helper requires Python su
p
p
o
rt
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-11
J
o
nath
a
n
Nieder
t7400: cl
a
rify
s
ubmodule
update
tests
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-11
Jo
n
athan Nieder
t7400: clarify 'submod
u
le
add' test
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-11
Jon
a
than
N
ieder
t7400
:
split
s
etup into multiple tests
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-04
Jon
a
tha
n
Niede
r
Teach
mailinfo %< as
an alternat
i
ve scissors mark
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-03
Jonathan Nieder
Makefile: future-pr
o
of Cygwin
version check
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jon
a
t
h
an Nieder
merge-recursive: add a label
f
or ancestor
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
che
r
ry-pick, revert: add
a label for
a
nce
s
tor
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jo
n
a
than
N
ieder
revert:
clarify labe
l
on
c
onflict hunks
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan
Nieder
com
p
at: add memp
c
py()
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
J
onathan Nieder
c
heckout
-m --con
f
lic
t
=
d
i
f
f3:
a
dd
a lab
e
l for ancestor
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
m
e
r
g
e_trees()
:
add
a
ncestor
l
abel
p
a
rameter f
o
r diff3
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonath
a
n
N
ieder
merge_f
i
le
(
)
: a
d
d comment e
x
plaining beha
v
ior w
r
t c
o
nfl
i
ct
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@mgila.com>
commit
|
commitdiff
|
tree
2010-03-21
J
ona
t
han Nieder
checkout --conflict=
d
if
f
3: add
a
label f
o
r ancesto
r
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
ll_merge(): add
a
ncestor label para
m
e
ter for diff3
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonat
h
an Nieder
merge-f
i
l
e
--d
i
f
f
3
: add
a label for anc
e
s
tor
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonatha
n
Nieder
xdl_merge(
)
:
move file1 and file2 labels t
o
xmparam
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jona
t
ha
n
Nieder
xd
l
_m
e
rge
(
): add
o
pti
o
nal ances
t
or
l
a
b
el to diff3-st
y
le
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan
N
ieder
tests: d
o
cument cherry-pick behavi
o
r
in fa
c
e of co
n
f
licts
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
next