repo.or.cz
/
git
/
debian.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
Jonath
a
n Nieder
m
e
r
ge_
f
ile
(
): add
c
o
mment explai
n
ing
b
e
h
avior wrt conflict
.
.
.
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Ni
e
der
checkout --conf
l
i
c
t=d
i
ff3: a
d
d
a label for ancestor
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jon
a
than Niede
r
ll_
m
erg
e
()
:
add ancestor l
a
bel
p
arameter for diff3
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonat
h
a
n
Niede
r
merge-f
i
le --diff3
:
a
d
d
a la
b
e
l
for ancestor
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nie
d
e
r
xdl_merge(): mo
v
e file1 a
n
d file2
l
abels to xmparam
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
J
onathan Nieder
xdl_merg
e
(): a
d
d optional an
c
estor label to
diff3-st
y
le
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
J
o
nathan
N
ieder
te
s
ts
:
doc
u
ment c
h
e
rry-pick behavior in fac
e
of c
o
nflicts
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan N
i
eder
t
e
st
s
:
docu
m
ent forma
t
of confli
c
ts f
r
om checkout -
m
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-20
J
o
nath
a
n Nie
d
er
Makefile: Fix occasional
G
I
T
-
CFLAGS breaka
g
e
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-20
Jonathan N
i
eder
Makefile: Fix CDPATH probl
e
m
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-28
Jonathan Nie
d
er
Make
f
i
le: clarify d
e
fini
t
ion of TES
T
_OBJS
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-23
Jona
t
ha
n
N
i
eder
a
m
:
r
e
move
r
ebase-apply dir
e
cto
r
y before gc
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-22
Jon
a
t
h
a
n
Nieder
tes
t
s:
F
ix race condition in t7006-p
a
ger
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-21
J
onathan
Ni
e
der
t70
0
6-p
a
ger:
if std
o
ut is not
a
termina
l
, make a new
one
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-20
Jonathan
N
ieder
tests: Add test
s
for automatic use of pager
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-15
J
onatha
n
Nieder
am: Fix launchi
n
g o
f
pager
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-15
Jonat
h
an
N
ied
e
r
git
svn: Fix
l
aunching
of pager
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-15
Jona
t
han Ni
e
der
git
.
1: Clarify the
b
e
havio
r
o
f
t
h
e --paginate option
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-15
Jonathan Nieder
Mak
e
'
g
it var GIT_PAGER
'
a
lways print the co
n
figured
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-15
Jona
t
han
Nieder
F
ix '
g
it va
r
' usage synopsis
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-31
Jon
a
t
han Niede
r
Makef
i
le: alwa
y
s remove
.
depe
n
d dire
c
tories on 'make
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-31
J
o
n
athan Nieder
M
a
k
efile: t
u
ck away generated makefile f
r
agments in
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-31
J
onath
a
n Nieder
Do
not install
s
hell libraries executabl
e
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-27
Jonathan Nieder
Teach Makefil
e
t
o check header dependencies
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-27
Jonatha
n
Nieder
Makefile: list standa
l
one program object
f
iles in PROGRAM_OBJS
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-26
Jonathan Nieder
Makef
i
le: lazily compu
t
e
h
eader de
p
e
n
dencies
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-26
J
o
nathan
Nieder
Makefile: lis
t
generated object fi
l
es in OBJ
E
CTS
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-26
Jonathan Nieder
Makefil
e
: dis
a
ble
d
e
fault i
m
plicit rules
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-26
Jonathan Nieder
Makefile: rearrange de
p
endency rules
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-26
Jonath
a
n Nieder
Makefile: tr
a
nspor
t
.
o
d
ep
e
nds on branch
.
h
now
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-26
Jonatha
n
Niede
r
Merge branch 'master'
o
f git://repo
.
or
.
cz/al
t
-git into
.
.
.
commit
|
commitdiff
|
tree
2010-01-26
Jonathan Ni
e
der
Mak
e
file: drop de
p
endency
on $
(
wildcard */*
.
h)
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-26
Jonathan
N
i
e
der
Makefile: clean up http-
w
alker
.
o de
p
endency rul
e
s
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-26
Jonatha
n
Niede
r
Makefile: remove wt-
s
t
a
tus
.
h from LIB_H
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-26
J
onat
h
an Nieder
M
akefile:
m
a
ke
sure tes
t
helpers are reb
u
ilt w
h
en headers
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-26
J
o
n
athan Ni
e
der
Makefile:
a
d
d m
i
ssing hea
d
er
file de
p
enden
c
i
es
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-24
Jonathan Nieder
Docum
e
ntation: merge: use MERGE_HEAD
t
o
refer to
t
he
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-24
J
o
nathan
N
i
e
d
er
Documen
t
at
i
on: simpli
f
y How Merge
Works
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-24
J
o
nathan N
i
eder
D
o
c
u
m
entatio
n
: mer
g
e
:
a
d
d
a
s
ection
a
bo
u
t
fast-forward
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-24
Jonath
a
n
N
ieder
Documenta
t
ion: em
p
hasize when git merge
t
er
m
inates
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-24
J
o
n
ath
a
n
N
ieder
Document
a
tion: merge: add an overvi
e
w
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-24
Jona
t
han Nie
d
er
Docum
e
nta
t
io
n
:
m
erge: move merge strate
g
y list to en
d
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-24
Jonathan Nieder
Documentation: suggest `reset
--merge` in How
M
e
rge
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-24
Jon
a
t
h
a
n
Nieder
Documen
t
a
ti
o
n: merge: mov
e
c
on
f
iguration
se
c
tion to end
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
Jonath
a
n Niede
r
Documentat
i
on: tiny gi
t
c
onfig ma
n
ual tweak
s
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
J
onathan
N
i
eder
Documen
t
ation: git g
c
p
acks refs by defaul
t
now
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
Jona
t
h
an N
i
e
d
e
r
Documen
t
ation: tiny git confi
g
m
anual tweak
s
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
Jonathan Nieder
Documentation: git gc packs refs by
d
efault now
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-07
Jonathan Nieder
git-gui: Mak
e
file: consolidate
.
FORC
E
-*
t
arg
e
t
s
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-06
J
onathan Nied
e
r
Make
f
i
l
e: con
s
ol
i
dat
e
.
FORCE-* ta
r
gets
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-06
Jonath
a
n Nieder
Makefile:
lear
n
to gen
e
r
a
t
e listings
for targets requiring
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-06
Jonath
a
n Nieder
Makefi
l
e
: use
ta
r
get-specific v
a
riable t
o
p
a
s
s flags
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-06
J
o
natha
n
Ni
e
d
er
M
a
kefile: r
e
generate assemble
r
listings when
a
sked
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-06
Jona
t
han Ni
e
der
Makefile: make ppc/sha1pp
c
.
o
d
e
pend o
n
GIT-CFLA
G
S
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-28
Jon
a
than N
i
e
d
er
M
a
k
e
file: do not clean arm di
r
ecto
r
y
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-18
J
o
nat
h
an Ni
e
der
Speed up bash c
o
mpletion lo
a
ding
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-13
Jonathan Nieder
Pr
o
vide
a
b
uild time def
a
ult-ed
i
tor s
e
tting
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-13
Jonat
h
an Nie
d
er
am -i,
g
it
-
svn: use "gi
t
var GIT_PAGER
"
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-13
Jonath
a
n Nieder
add -i,
send-e
m
ail, svn, p4, etc:
u
se
"
git var GIT_EDI
T
OR"
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-13
J
o
nathan
N
i
e
der
Teach git var
about GIT_PAG
E
R
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-13
Jo
n
athan Nieder
Teach g
i
t var abo
u
t
GIT
_
E
DITOR
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-13
J
o
nathan N
i
eder
Suppress warni
n
gs from
"gi
t
v
ar -l
"
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-13
Jo
n
athan
N
ieder
Do not use VISUAL edi
t
o
r
on dumb
t
erminals
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jo
n
a
t
han Nieder
di
f
f
-
-no-ind
e
x: m
a
ke the usage stri
n
g les
s
sca
r
y
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jo
n
athan Nieder
m
e
rge-{re
c
ursi
v
e
,subtree}: use
us
a
g
e
f() to print us
a
ge
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
J
o
na
t
han Nieder
I
n
troduce usagef() th
a
t t
a
k
e
s a printf-style
format
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan
N
i
ed
e
r
Let 'git <
c
ommand>
-h' show usage wit
h
out a git di
r
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan Nieder
S
how
usa
g
e string
f
or 'git ht
t
p-pu
s
h -
h
'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan Nied
e
r
Let 'g
i
t http-fet
c
h -
h
'
show usage ou
t
side a
n
y
g
it
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan Nieder
S
h
ow usage s
t
ring
for 'g
i
t stripspace -h'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan Ni
e
der
Show usage s
t
ri
n
g
for
'
git u
n
pack-
f
ile -
h
'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jon
a
than Ni
e
der
Show
usage
s
t
r
ing f
o
r 'git sho
w
-i
n
dex -h'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
J
onat
h
an Nieder
Sho
w
usage string for 'git
rev-p
a
rse -h'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan Nie
d
er
Show us
a
ge string for 'git merge-o
n
e
-
file
-
h'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
J
ona
t
han Ni
e
de
r
Show usage string f
o
r 'git mail
s
plit
-
h'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jo
n
at
h
an
N
ieder
Sh
o
w
us
a
ge str
i
ng for 'git imap-send -h'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan Ni
e
d
e
r
Show usage string fo
r
'git
g
et-tar-commit-id -h'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan Ni
e
der
Show usage s
t
r
i
n
g
f
or 'git
fast-
i
mpor
t
-h'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan Nie
d
er
S
h
ow usage
s
tring for 'git check-ref-fo
r
mat -h'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jon
a
t
h
an Nieder
http-fet
c
h: a
d
d missi
n
g initialization of arg
v
0
_path
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan Nied
e
r
merge: do not setup worktree twice
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jo
n
athan Nieder
che
c
k-ref-format: update us
a
ge str
i
n
g
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
J
o
natha
n
Nieder
Show usage stri
n
g fo
r
'git show-r
e
f
-h'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
J
on
a
than Nied
e
r
Sh
o
w usage string for 'git merge
-
ours -h'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan
N
ieder
Show usage strin
g
for
'
git commit-tre
e
-h'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
J
onatha
n
Nieder
Sho
w
u
s
a
ge
s
tring for 'git
c
her
r
y -h'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan Nie
d
er
Show usa
g
e
st
r
ing for 'git grep -h'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonatha
n
Nieder
R
e
tire fet
c
h-
-
tool helper to contrib/exam
p
l
es
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-09
Jonat
h
an
N
ied
e
r
Add intermedi
a
te build products to
.
g
i
tignor
e
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-10-31
J
onathan
N
i
e
der
Handle
m
ore
s
h
ell metacha
r
acters
i
n editor na
m
es
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-10-30
Jon
a
than
Niede
r
clone: detect e
x
tra arguments
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-10-13
Jonat
h
a
n
Ni
e
d
e
r
check-ref-
f
orm
a
t: si
m
plify --print i
m
p
lementati
o
n
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-10-12
Jonathan Nieder
Documenta
t
i
on: describe check-r
e
f-
f
ormat --branch
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-10-12
Jonath
a
n Nieder
Add tes
t
s
f
or git che
c
k-ref
-
format
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-10-10
Jo
n
athan Nieder
Document
a
tion: clone: clari
f
y discussion of init
i
a
l
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-10-09
Jona
t
han Niede
r
r
acy-git
.
txt: explai
n
nsec problem
i
n more detail
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-10-09
Jon
a
than Nieder
D
ocumentation: clar
i
fy "working tree" defi
n
ition
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-10-09
Jonath
a
n
N
ieder
D
o
cumen
t
atio
n
: cla
r
i
fy branch creat
i
o
n
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-10-09
Jona
t
han
Nieder
D
ocu
m
entation: br
a
nch: update --m
e
rged description
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-10-09
Jonathan Nieder
Documentation: clarify mergeoptions de
s
cription
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
next