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: Make 'merge.log' an integer or boolean option
2010-08-18
Jonathan Nieder
merge scri
p
t:
l
e
a
rn --[no-]rerere-autoupdate
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonatha
n
N
ieder
merge scri
p
t: n
o
t
i
ce @{-1} shorthan
d
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jona
t
han Nieder
merge s
c
r
i
pt
:
handle --n
o
-
f
f --n
o
-
commit cor
r
ectly
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonatha
n
N
i
ed
e
r
merge script: --
f
f
-
on
l
y to
dis
a
llow true merge
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
merge scri
p
t: h
a
ndle man
y
-way octo
p
u
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
merge sc
r
ipt
:
handle -m -
-
l
og correct
l
y
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
J
onathan Nieder
mer
g
e script:
f
orb
i
d m
e
rge
-
s index
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
merge sc
r
ipt: allow c
u
stom strateg
i
es
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
m
e
r
g
e
script: m
e
rge -X<option>
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jo
n
ath
a
n
N
ieder
mer
g
e
script: imp
r
o
v
e l
o
g mes
s
age subje
c
t
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
merge
s
cr
i
pt: refuse to merge during merge
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
J
onathan
N
ieder
merge s
c
ript: tweak unmerged files m
e
ssage
t
o
match
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
merge scri
p
t: --squash, --ff from unborn
b
ranch are
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonat
h
an Nieder
fmt-me
r
ge-msg
-
m
t
o
o
v
e
rri
d
e merge title
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
merge-base
-
-indep
e
ndent t
o
print reduce
d
parent list
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan
N
ieder
merge-base --oc
t
opus to
m
imic s
h
ow-branc
h
--merge-base
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
Documentation: add a SEE ALSO se
c
tion f
o
r merge-base
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan
N
ie
d
e
r
t
6
200
(
fmt-merge-msg): style ni
t
picks
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
J
o
nathan Nie
d
er
t6010
(m
e
rge-bas
e
): mode
r
nize style
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
t760
0
(m
e
rge): te
s
t merge
from branch yet to be
bo
r
n
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nie
d
er
t7600 (merge)
:
c
hec
k
reflog entry
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jon
a
than
N
ieder
t7600 (
m
e
rg
e
):
do
n
ot launch g
i
tk f
o
r --debug
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
J
ona
t
han Nied
e
r
t76
0
0
(
merge):
modernize
style
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonatha
n
Nieder
merge: do not m
i
stake (ancestor of)
t
ag for bran
c
h
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-21
Jonathan
N
ieder
t/
R
EADME:
cor
r
e
ct an exception when breaking a && chain
.
.
.
commit
|
commitdiff
|
tree
2010-07-16
Jonathan Nieder
A
d
d a sample user for the svndump
l
ibrary
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-15
J
ona
t
han Nieder
Documentation: a
d
d submo
d
u
l
e
.
* to
the big con
f
igu
r
at
i
on
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-15
Jonathan N
i
e
d
e
r
gitmodu
l
es
.
5: url can be
a
relative path
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-14
Jona
t
h
a
n
N
i
eder
git --pagina
t
e: pa
g
inate external comm
a
nds
a
g
ain
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-12
Jonatha
n
Nieder
t3000 (ls-fil
e
s
-
o
)
: moderni
z
e s
t
yle
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-08
Jo
n
athan Nieder
t9118 (g
i
t-
s
vn): prev
e
nt
ea
r
ly failure from
ta
k
ing
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-07
J
o
nathan N
i
eder
t/README: document more t
e
st helpers
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-29
Jonathan Nied
e
r
revert:
do not r
e
b
u
i
l
d
a
rg
v
on heap
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-28
Jonat
h
a
n Nieder
tests
:
lo
c
al c
o
nfig file should be
h
onore
d
f
r
om subdirs
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-28
Jona
t
h
a
n Nieder
t7006: test pager c
o
nfiguration for several git comman
d
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-28
Jonathan Nieder
t7006
(pa
g
e
r
): in
t
r
odu
c
e helper for parameterized
t
es
t
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-14
Jonathan
Niede
r
t3508
(
ch
e
rry-pick): futur
e
p
roof
a
gainst
unmerge
d
files
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-14
J
on
a
than Ni
e
der
g
i
t
-svn:
st
r
ip o
f
f
le
a
ding sl
a
shes on
--tru
n
k
argumen
t
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-13
Jona
t
han Nieder
a
d
d-in
t
erac
t
ive: Clarify “
r
emainin
g
hun
k
s in the f
i
le”
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-13
Jo
n
athan Niede
r
grep: refact
o
r grep
_
obje
c
ts loop into
i
ts own function
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-11
Jonathan Nieder
Docume
n
tation/che
c
kout: clarify description
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-11
Jonath
a
n Nieder
r
e
bas
e
-i -p: document sh
o
rtcomi
n
gs
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-02
Jona
t
han Nieder
DW
I
M '
g
it show
-
5
'
to 'gi
t
show
-
-
do-w
a
l
k -5'
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-01
Jon
a
than Nieder
gitignor
e
.
5: Clarify matc
h
i
ng rules
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-01
Jonath
a
n Nieder
reb
a
se:
im
p
rove e
r
ror
message wh
e
n
u
pstream
argume
n
t
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-01
Jo
n
ath
a
n Nieder
D
ocumentation/
c
heckout: clarif
y
d
e
s
cri
p
tion
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-28
Jonathan Nieder
f
sck: fix
b
ogus commit header check
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-20
Jonathan
Nieder
Add git rem
o
te set-bra
n
ches
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-20
Jonath
a
n
Nieder
post-rece
i
v
e
-email: d
o
cument
comm
a
nd-line mo
d
e
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jon
a
than Nieder
git svn:
a
void
u
nini
t
ial
i
zed var in
'
r
eset'
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonat
h
an Nieder
Make
f
ile: let header
dependency
c
hecker
ove
r
ride C
O
MPUTE_H
E
A
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonath
a
n Nied
e
r
Mak
e
f
i
le: fix header depen
d
ency checker to a
l
low
NO_CURL
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Nieder
D
o
cumentation/notes: nitpick
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan N
i
e
d
er
D
o
c
u
mentation/
n
otes: cl
e
an up description of
rewriting
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonatha
n
N
i
e
der
D
ocumentation/notes: simpl
i
fy
treatm
e
nt of default
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
J
o
na
t
h
an Nie
d
e
r
D
oc
u
menta
t
ion
/
log: ad
d
a
CONFIGURATION section
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan N
i
e
der
Docum
e
ntation/notes
:
simplify tre
a
tment of default
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Nie
d
e
r
Document
a
tion/notes
:
a
dd configuration
s
e
ctio
n
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Ni
e
d
er
Docume
n
tation/notes: describe content of notes
blobs
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Nieder
Documentation/notes: docu
m
ent
f
o
rmat
o
f
note
s
tr
e
e
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-08
Jo
n
ath
a
n
Nieder
cherry
-
pi
c
k
: do not d
u
m
p core when iconv fails
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-08
J
onathan Nieder
pretty: in
i
tiali
z
e new cm
t
_
f
mt_
m
a
p
to 0
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-08
Jonathan Ni
e
der
a
dapt request-pull tes
t
s for new pull reques
t
format
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-06
Jonathan Nieder
te
s
t
-
l
i
b
: some
shells do
n
ot
l
e
t
$? prop
a
gate int
o
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jonathan Nieder
shortlog
:
D
o
c
ument
and test --format o
p
tion
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jonatha
n
Nieder
t
4201 (shortlog): Test output format w
i
th multiple
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jonathan
N
ieder
t4201
(
shortlog): g
u
ard setup with test_expect_
s
uccess
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jonathan Nieder
Documentatio
n
/shortlog:
s
cr
i
pt
e
d users
s
hould not rely
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
J
o
nathan
Nieder
commit --
a
mend: cope with missin
g
display name
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
J
o
na
t
han Ni
e
d
e
r
tes
t
-lib:
L
et tests sp
e
cify co
m
m
ands to be r
u
n at e
n
d
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-01
Jon
a
than Nieder
fsck: ch
e
ck ident lin
e
s
in commit objects
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-01
Jonat
h
an Nie
d
er
requ
e
st-pull: pr
o
tect against OPTIONS
_
KEEPDASHDAS
H
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-01
Jo
n
at
h
a
n
N
ieder
tes
t
s for request-p
u
ll
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-22
J
onathan Nieder
Docume
n
tation/
M
akefile: fix interru
p
ted builds of user
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-20
J
o
nathan Nieder
fix "bund
l
e
--stdi
n
" se
g
fault
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-20
J
o
nathan Nieder
t5704
(
bu
n
dle): add test
s
for bundle --stdin
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-17
Jonathan Nieder
tag
-
v: use RUN_GIT_CMD to run ve
r
i
fy-tag
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-15
J
o
nathan Nieder
Docu
m
e
nt new
"
a
lready-m
e
rg
e
d" rul
e
for branch -d
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-15
J
o
n
ath
a
n Nie
d
er
A
dd
.
depend dir
e
ctor
i
es to
.
gitignore
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-15
Jonathan N
i
ed
e
r
t7006: guar
d
clean
u
p
w
ith tes
t
_expect_su
c
ce
s
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-13
Jonath
a
n Nieder
t5800: tes
t
g
i
t hel
p
er requires Python s
u
p
p
ort
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-11
Jonat
h
an
N
ieder
t7400: c
l
arify
s
ubmodule u
p
d
a
te tes
t
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-11
Jo
n
a
t
han Nieder
t
7
400: clarify 'submodule add' tests
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-11
J
onathan N
i
eder
t7400: split setup into multip
l
e tests
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-04
Jon
a
tha
n
Nie
d
e
r
Teach
m
ailin
f
o %< as an alter
n
at
i
ve scissors
mark
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-03
Jonat
h
an Nie
d
er
M
a
kef
i
le:
future-proof Cygwi
n
version check
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Ni
e
der
m
erge-recursive: a
d
d a label for a
n
cestor
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Ni
e
d
e
r
che
r
ry-
p
ic
k
,
revert:
a
d
d
a label
f
o
r ancestor
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonath
a
n N
i
ede
r
revert
:
c
l
arify label
o
n c
o
n
fl
i
ct hunks
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jo
n
athan Nieder
co
m
pa
t
:
add mempcpy()
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jon
a
than Nieder
chec
k
o
u
t -m --conflict=dif
f
3: add
a
l
a
bel f
o
r ancestor
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
J
onath
a
n Nieder
me
r
ge_trees(): add ancestor la
b
el parameter for diff3
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jona
t
han Nieder
merge_fi
l
e(): add comment explaining behavior wr
t
conflict
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@mgila.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan N
i
eder
checko
u
t --co
n
flict=diff3: add a label for anc
e
sto
r
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
ll_merge(
)
: add a
n
ce
s
tor
l
a
bel parameter for
d
iff3
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jona
t
han
N
ie
d
er
me
r
g
e
-file -
-
d
i
ff3: add
a
l
a
bel for ancestor
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
J
o
nathan Nieder
xdl_merge(): move f
i
le1 and file
2
labels to
x
mparam
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonatha
n
N
iede
r
x
d
l_mer
g
e(): add
o
p
tion
a
l
a
ncestor label t
o
diff3-st
y
le
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
tests: document cherry-pi
c
k behavi
o
r in face of
conflicts
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonat
h
a
n
N
ieder
te
s
ts: documen
t
for
m
at of conf
l
icts from checkou
t
-m
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
next