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_file(): add comment explaining behavior wrt conflict style
2010-03-21
Jonathan Nieder
merge_file():
a
dd comment e
x
pl
a
in
i
ng behavior wrt c
o
n
f
l
ict
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@mgila.com>
commit
|
commitdiff
|
tree
2010-03-21
J
onathan Nieder
chec
k
out --conflict=diff3:
a
dd a label
f
or ancestor
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jo
n
athan Nied
e
r
ll_
m
e
rge():
add ances
t
or labe
l
paramet
e
r for diff3
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
merge-file
--diff3: ad
d
a label
f
or ancestor
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
J
onath
a
n N
i
eder
xdl_m
e
rge(): move f
i
le1 and file2 lab
e
ls to xmpar
a
m
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
xdl
_
merge(
)
: add opti
o
nal a
n
c
e
s
t
or label to diff3-st
y
le
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jon
a
t
han Nieder
tests
:
d
o
c
ument c
h
erry-pick beh
a
v
i
or in face of conflict
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan N
i
ede
r
te
s
ts: document format of
conflic
t
s f
r
o
m
checkout -m
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-20
Jonathan N
i
ed
e
r
Makefile:
Fix
o
ccasiona
l
GIT-C
F
LAGS b
r
eaka
g
e
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-20
Jonathan Nied
e
r
Makefile: Fix CDPATH problem
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-02-28
Jon
a
t
h
an N
i
eder
Makefile:
c
larif
y
defini
t
ion o
f
TEST_OBJ
S
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-02-23
Jonathan Nieder
am: remove rebas
e
-
a
pply
d
irectory before gc
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-02-22
J
o
n
a
t
han
Nieder
t
ests: Fix race condit
i
on in t
7
006-pager
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-02-21
Jo
n
at
h
an Nieder
t7006-pag
e
r: if stdou
t
is
not a t
e
rminal, make
a
new one
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-02-20
Jona
t
han Nieder
t
e
sts: Add t
e
s
ts for automatic use
o
f
pager
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-02-15
J
o
nathan Nieder
am
:
Fix launchi
n
g of page
r
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-02-15
Jonathan Nieder
git svn: Fix launching of pager
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-02-15
Jon
a
than N
i
eder
git
.
1:
Clarify the behavior of
the
-
-p
a
ginate o
p
tion
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-02-15
Jon
a
t
han Nied
e
r
Ma
k
e
'git var G
I
T_P
A
GER
'
alway
s
print the conf
i
gure
d
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-02-15
Jonathan Nieder
F
ix 'git var' usage synopsis
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-31
Jonathan Nieder
Makefile: always remove
.
depend directories on 'make
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-31
Jonat
h
an Nieder
M
akefile: tuck aw
a
y gene
r
ate
d
makefile
f
ragments in
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-31
Jo
n
athan Nieder
Do not instal
l
shell
libraries executable
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-27
Jonat
h
an
N
ieder
Teach Makefile
to check header dependencies
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-27
Jonathan Nied
e
r
Makefile: lis
t
s
tandalone
program obje
c
t files in PROG
R
AM_OBJS
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-26
Jonathan
N
ieder
Makefi
l
e:
lazily co
m
pute
h
eader dependencies
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-26
Jona
t
han Nied
e
r
Makefile: list generated object files in OBJ
E
CTS
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-26
Jonathan Nieder
Makefile: disable defa
u
lt
implicit rules
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-26
Jonathan Nieder
Make
f
ile: rearrange dependency rules
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-26
Jo
n
athan Ni
e
de
r
Mak
e
file: tr
a
nsport
.
o
depen
d
s on branch
.
h
n
ow
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-26
Jo
n
athan
N
ieder
Merge bra
n
ch 'mas
t
er
'
o
f
git://rep
o
.
or
.
cz/
a
lt
-
git into
.
.
.
commit
|
commitdiff
|
tree
2010-01-26
J
o
nathan Nied
e
r
M
akefile: drop dependen
c
y on $(wildc
a
rd *
/
*
.
h)
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-26
Jonathan N
i
e
der
Makefil
e
: cl
e
an up http
-
walker
.
o dependency rules
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-26
Jonathan Nieder
Makefil
e
: re
m
ov
e
wt-status
.
h f
r
om
L
IB_H
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-26
J
o
nathan Nie
d
er
Makefile: make sure test h
e
lpers
are
r
ebuilt when
headers
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-26
Jonathan Nied
e
r
Makefile: add missi
n
g header file dependencies
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-24
Jonathan
N
ie
d
er
Documentation
:
m
e
rg
e
: use MERGE_HEA
D
to refer to the
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-24
J
o
na
t
han Nieder
D
ocumenta
t
ion: simplify How Merge Works
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-24
Jona
t
han Nieder
Documenta
t
ion:
merge: add a
s
ectio
n
about fas
t
-forwa
r
d
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-24
Jonathan
Ni
e
der
Documen
t
ation: emphas
i
ze
when gi
t
merge termina
t
es
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-24
Jonathan Niede
r
Doc
u
mentation
:
merge: add an
o
ver
v
ie
w
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-24
Jonat
h
an Ni
e
der
D
ocume
n
tatio
n
:
merge: move m
e
r
g
e s
t
r
a
tegy list
t
o e
n
d
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-24
J
o
n
a
t
han N
i
e
d
er
Documentation: suggest `reset --merge` in How Merge
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-24
Jonath
a
n Nied
e
r
D
o
cument
a
tion: merge: move confi
g
uration sectio
n
to end
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
Jonat
h
an Nieder
Documentation
:
t
i
n
y gi
t
config manual twea
k
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
Jon
a
th
a
n
N
ie
d
er
Documentation
:
g
i
t gc pack
s
refs by def
a
ult now
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
Jonathan Nie
d
er
Docume
n
tation: tiny git config m
a
n
u
al tweak
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
Jonat
h
a
n Nieder
Docum
e
ntat
i
on: g
i
t gc
p
acks r
e
fs by de
f
a
u
lt n
o
w
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-07
Jonat
h
an
N
ieder
git-gui: Ma
k
efile:
c
onsolidate
.
FORCE-* targ
e
ts
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-06
Jonathan
N
ieder
M
a
kefile:
consoli
d
ate
.
FORCE-* targets
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-06
Jonathan Nieder
Make
f
ile
:
learn to generate lis
t
ings for targets requiring
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-06
Jon
a
than Nieder
Mak
e
file
:
u
se target-specific variable
t
o
p
ass flags
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-06
Jon
a
th
a
n N
i
eder
M
akefi
l
e: regenerate as
s
e
mbler listings w
h
e
n
asked
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-06
Jonathan N
i
eder
M
a
kefile: m
a
ke ppc/
s
ha1pp
c
.
o
d
epend on
GIT-CFLAGS
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-28
Jonat
h
an Nieder
Makefile:
d
o
n
o
t clean arm d
i
rector
y
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-18
Jo
n
athan Nieder
Speed
u
p bash
completio
n
l
oading
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-13
Jona
t
han N
i
eder
Provid
e
a b
u
ild ti
m
e
default-edit
o
r setting
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-13
Jo
n
ath
a
n Nied
e
r
a
m
-i, g
i
t-svn: use "git va
r
G
IT_
P
AGE
R
"
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-13
Jona
t
han Nied
e
r
a
dd -i
,
send-email, svn, p4,
etc: use "
g
it
v
ar GIT_EDI
T
O
R"
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-13
Jonathan
N
ieder
Teach
g
it var about GIT_PAGER
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-13
Jonathan Nieder
Teach git var
a
bout G
I
T_EDITO
R
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-13
Jonathan Nieder
Suppress war
n
ings from "git var -l"
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-13
Jonathan Nieder
Do n
o
t use VISUAL edi
t
or on dumb terminals
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-10
Jonath
a
n N
i
eder
diff --no-ind
e
x: make the usage string less
scary
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-10
Jo
n
athan Nieder
merge-{recursive,sub
t
r
e
e}
:
us
e
usagef() t
o
print usage
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-10
J
o
nathan N
i
eder
Introduce us
a
ge
f
() tha
t
takes a printf-style form
a
t
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan N
i
e
d
er
Le
t
'gi
t
<comm
a
nd>
-h'
s
ho
w
usage without a git dir
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan Nieder
Sh
o
w usage string for 'git ht
t
p-push
-
h'
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan Niede
r
Let 'g
i
t http-
f
etch -h' show us
a
ge outsi
d
e any git
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan Nieder
S
how
u
sage string for 'git stripspace -h'
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-10
Jon
a
than Nieder
Show usage string
for 'git u
n
pack-file -
h
'
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-10
Jo
n
a
t
han Nieder
Show
usage string
for 'git show-index -h'
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-10
Jonat
h
an
Nied
e
r
Show usage str
i
ng
f
or 'git
r
e
v-p
a
rse -h'
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-10
Jona
t
han Ni
e
d
e
r
Show
usage
s
t
r
ing
f
or 'git
m
erge-one-file -h'
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-10
Jo
n
athan N
i
e
d
e
r
S
how u
s
age st
r
ing
for 'gi
t
mailsplit -h'
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-10
J
o
nathan Niede
r
Show usage string for 'git imap-
s
end -h'
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-10
J
onathan Nie
d
er
S
h
o
w
u
s
age st
r
ing for 'git get
-
t
a
r
-
c
o
mmit-id
-h'
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-10
Jonath
a
n Ni
e
d
er
Show
us
a
ge s
t
ring
for 'git fast-import -h
'
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-10
J
o
n
athan Nieder
Show us
a
ge str
i
n
g
for 'git
check-ref-fo
r
m
at -h'
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan Nieder
http-fetch: add mis
s
in
g
initializa
t
ion of a
r
g
v
0
_path
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan
N
ieder
merge:
d
o
n
ot setup worktr
e
e t
w
ice
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-10
J
onathan
N
ieder
check-re
f
-fo
r
mat: update usage string
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-10
J
o
n
ath
a
n Nieder
Sho
w
usage string for 'git
s
how-re
f
-h'
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan
N
iede
r
Show usa
g
e s
t
r
in
g
f
o
r 'g
i
t merge-ours -h'
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan Nied
e
r
Show us
a
ge str
i
ng for 'git
co
m
mit-tree
-h'
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan Nieder
Show usage strin
g
for '
g
i
t
cherry -
h
'
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan
N
i
eder
Show usa
g
e string for 'git
g
re
p
-h'
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-10
Jonatha
n
Ni
e
der
Retire f
e
tch--to
o
l
h
e
lper to contrib/examples
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-09
Jonathan Nieder
Add in
t
ermediate bui
l
d products to
.
gitignore
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-10-31
J
on
a
th
a
n Nieder
Ha
n
d
l
e
m
ore shell metacharacters in editor na
m
es
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-10-30
J
onathan N
i
eder
cl
o
ne: de
t
e
c
t extra argum
e
n
ts
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-10-13
Jon
a
tha
n
N
i
eder
c
h
eck-re
f
-f
o
rmat: simplify
-
-
prin
t
im
p
leme
n
tati
o
n
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-10-12
Jonathan Nieder
Docu
m
e
n
t
ation: describe c
h
eck-ref-forma
t
--branch
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-10-12
Jonathan Nieder
Add tes
t
s
f
or gi
t
check-
r
ef-for
m
at
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-10-10
Jonathan Nieder
Documentation: clone: clarify discussion
o
f initial
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-10-09
Jonathan Nieder
racy-git
.
txt: explain nsec problem in m
o
r
e
detail
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-10-09
Jonathan
Ni
e
de
r
D
o
cumentation:
c
l
arify "workin
g
tree"
defi
n
ition
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-10-09
Jonath
a
n Nied
e
r
Documentation: cl
a
rif
y
br
a
nch creation
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-10-09
Jon
a
than Niede
r
D
o
cum
e
ntation: branch: u
p
date
-
-merged
descr
i
ption
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-10-09
Jonathan Nieder
Docu
m
e
nt
a
tion:
clarify
mergeoptions description
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
next