repo.or.cz
/
git
/
gitster.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
fsck: check ident lines in commit objects
2010-05-01
Jonathan Nieder
f
s
ck: check ident
l
i
n
es in commit o
b
jects
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-22
J
o
n
athan Nie
d
e
r
Do
c
umentation/
M
a
kefile: fix inter
r
upted b
u
ilds of user
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-17
Jonathan Nieder
ta
g
-v:
use
R
UN_GIT_CMD t
o
ru
n
ver
i
fy-
t
ag
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-15
Jona
t
han
Nieder
D
o
cu
m
ent new "alrea
d
y-merged" rule for branch -d
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-15
Jonath
a
n Nieder
A
d
d
.
d
e
pe
n
d directories to
.
gitig
n
ore
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-04
Jonatha
n
Nieder
Teac
h
mai
l
info %
<
as an alter
n
ative sciss
o
rs mark
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-03
Jon
a
than Niede
r
Make
f
ile: future
-
proof
Cygwin ve
r
sion check
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
J
onathan Nieder
merge-rec
u
rsi
v
e: add a l
a
bel for ancestor
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
J
o
n
athan Ni
e
der
cherr
y
-
p
ick, revert:
a
dd a label for
a
n
cesto
r
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jona
t
han N
i
eder
revert:
c
l
arify label on
conflict
h
unks
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
c
o
mpat: add mempcpy()
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jon
a
than N
i
eder
checkout -m
--conflict=diff3: add
a
label for
a
ncestor
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonat
h
a
n
Ni
e
d
e
r
me
r
ge_tree
s
(): add
anc
e
stor label parameter
f
or diff3
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
me
r
g
e
_file(): add comment explaining beha
v
ior wrt conflict
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@mgila.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nie
d
er
c
hecko
u
t --co
n
fl
i
ct=d
i
ff3: add
a
label for ances
t
or
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
ll_merge(): add ancestor label paramet
e
r f
o
r diff3
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonatha
n
Nieder
merge-file --dif
f
3: add
a
lab
e
l for ancestor
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
J
onathan Nieder
x
dl_m
e
rge(): move file1 and
file2
l
abe
l
s to xmp
a
ram
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jona
t
h
a
n N
i
eder
xdl_merge(): add optional
a
ncestor label to diff
3
-style
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonath
a
n Nieder
tests
:
d
o
cument cherry-
p
ick beh
a
vior in
f
ace of conflicts
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
J
onathan Nie
d
er
tests: document format of confl
i
cts from checkout -m
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonatha
n
Nieder
revert: fix tiny mem
o
ry leak i
n
c
he
r
ry-pi
c
k --
f
f
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-20
Jonathan Nie
d
er
Makefile: Fi
x
occasional GIT-CFLAG
S
b
reak
a
g
e
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-20
J
onathan Nieder
Ma
k
efil
e
:
F
ix CDPATH problem
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-20
J
o
n
a
than Nieder
g
itk: Don
'
t clobber "R
e
member this v
i
e
w"
setting
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-20
Jona
t
han
N
i
ed
e
r
gitk: Add co
m
ments to explain encod
e
_
v
iew_opts and
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-02-28
Jona
t
han N
i
ed
e
r
M
ake
f
ile: clarif
y
d
efinitio
n
of TEST_OBJS
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-02-23
Jon
a
than N
i
eder
am:
re
m
ove reb
a
se-apply
directory
b
efore gc
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-02-22
Jonathan Niede
r
tests: Fix race condition in t700
6
-pager
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-02-21
Jonathan Nied
e
r
t
7
006-pager: if stdou
t
is
not
a te
r
mina
l
,
make
a new
one
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-02-20
J
o
nathan Nieder
t
e
sts: Add tests for automatic u
s
e of pa
g
e
r
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-02-15
Jonatha
n
Nieder
am:
Fix launching
of
page
r
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-02-15
Jo
n
athan Ni
e
der
git svn: Fix launching of pager
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-02-15
Jonathan Nieder
git
.
1
: Clarify the behavior of the --paginate o
p
tion
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-02-15
Jonath
a
n Ni
e
der
Make 'git var GIT_
P
AGER
'
alw
a
ys
p
rint the conf
i
gured
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-02-15
Jonathan N
i
eder
Fix 'git v
a
r
'
usage synops
i
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-31
Jonathan N
i
eder
Makef
i
le:
a
lways
r
emo
v
e
.
depe
n
d dire
c
tor
i
es on 'ma
k
e
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-31
Jonathan Nieder
Make
f
ile: tu
c
k a
w
ay generated m
a
kefile f
r
a
g
men
t
s
in
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-31
Jo
n
athan Nied
e
r
Do not
i
nst
a
ll shell libraries execu
t
ab
l
e
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-27
J
onathan
N
ieder
T
e
ach Makefile to
c
heck head
e
r d
e
pendenc
i
es
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-27
Jonathan Nieder
Make
f
ile: list stan
d
alone prog
r
am obje
c
t
f
ile
s
i
n PROGRAM_OBJS
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-26
Jonathan Nieder
Makefi
l
e: lazily compute
h
eader depend
e
nc
i
es
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-26
Jonatha
n
Niede
r
Makefile: list generated object files in
O
BJECTS
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-26
Jonathan N
i
e
der
M
a
k
e
file
:
d
i
sable
d
e
fault i
m
plic
i
t ru
l
es
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-26
Jonat
h
a
n
Nieder
Ma
k
e
f
ile:
r
e
a
rrange dep
e
nden
c
y rules
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-26
Jonathan
N
ieder
Makefile: transport
.
o d
e
pends
o
n branch
.
h
n
ow
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-26
Jonathan
N
ieder
Merg
e
branch 'master' of git://repo
.
or
.
cz/alt-git into
.
.
.
commit
|
commitdiff
|
tree
2010-01-26
Jo
n
a
t
h
a
n Nieder
M
ak
e
f
ile: drop dependency on $(w
i
ld
c
ard */*
.
h)
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-26
Jonat
h
an N
i
eder
Makefile:
c
l
e
an up h
t
tp-walker
.
o de
p
end
e
ncy rules
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-26
J
onathan Nieder
Makefile: remove
wt-s
t
a
t
us
.
h from LIB_H
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-26
Jon
a
t
han N
i
e
d
er
Mak
e
file: make sure test helpers are
rebuilt
w
hen
h
e
aders
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-26
J
o
nathan Nieder
Makefile: add missing he
a
d
e
r file depe
n
dencies
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-24
J
o
nathan Ni
e
der
Docu
m
e
n
tation: merge
:
use ME
R
GE_H
E
A
D
t
o refer to
t
he
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-24
Jonathan Ni
e
d
er
Docu
m
entation: si
m
p
lify How
M
erge Works
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-24
Jon
a
t
h
an Nie
d
e
r
D
o
cume
n
ta
t
ion: mer
g
e: add a section
about fast-forwar
d
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-24
J
onathan Nieder
Documenta
t
ion: e
m
phasize w
h
en git merge termina
t
es
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-24
Jo
n
athan Niede
r
Documentation: merge
:
add an overview
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-24
Jon
a
than Nieder
Document
a
tion: merge:
move m
e
rge strategy list to en
d
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-24
Jonathan Nieder
D
o
cumentati
o
n:
suggest `re
s
et
-
-me
r
g
e
` i
n
Ho
w
M
erge
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-24
J
o
na
t
han
N
ie
d
er
D
ocumentat
i
on: me
r
ge: mov
e
con
f
igura
t
ion
s
e
c
tion to end
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
Jonathan Nieder
Documen
t
ation
:
tiny git con
f
ig
m
an
u
al twe
a
ks
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
J
onathan Nieder
Document
a
t
i
on: git gc
p
acks
ref
s
by default no
w
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
Jonat
h
a
n Nied
e
r
D
o
cu
m
entation:
tiny git
config manual
tweaks
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
Jonathan Nieder
Do
c
umentation: git
g
c
packs re
f
s
b
y default now
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-07
Jonathan Nied
e
r
git-gui: M
a
kefile: consolidate
.
F
O
RCE-* tar
g
ets
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-06
Jona
t
han Nieder
Makefile: consolidate
.
FORCE-
*
targets
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-06
Jona
t
h
a
n N
i
eder
Makefile: learn to
g
enerate lis
t
ings
f
or t
a
rgets
r
e
quiring
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-06
Jonathan Nieder
Makefil
e
: use target-specific
v
a
r
i
able to pa
s
s flags
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-06
Jonathan
N
iede
r
Mak
e
file: rege
n
erate assembler listings when ask
e
d
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-06
Jo
n
athan Niede
r
Makefi
l
e: ma
k
e ppc/sha1ppc
.
o de
p
end
on GIT
-
CFLA
G
S
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-28
Jo
n
a
t
han
N
iede
r
M
akefile: do
not clean arm
directory
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-18
Jonathan Nieder
Spe
e
d up b
a
sh comple
t
ion loading
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-13
Jonathan
N
i
eder
Provide a
b
uild time
d
efaul
t
-editor setting
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-13
Jonathan Nieder
a
m
-i, git-svn: use
"
git var GIT_P
A
GER"
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-13
J
o
nathan Nieder
add
-i, send
-
ema
i
l
, svn, p
4
, etc
:
u
s
e "git var GI
T
_EDITOR"
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-13
Jonathan Nieder
Teach git var abo
u
t GIT_PAGER
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-13
Jona
t
han Nied
e
r
Teach
git v
a
r abo
u
t
GIT_EDITOR
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-13
J
o
nathan Niede
r
Suppress
w
a
r
nin
g
s
from
"git var -l"
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-13
Jonath
a
n Nied
e
r
Do not use VISUA
L
edit
o
r on dumb termi
n
als
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan
Nieder
diff
-
-no-index: make the usage
string l
e
ss scary
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan Nieder
m
e
r
g
e-{re
c
ursi
v
e,subtree}:
use usagef() t
o
print usage
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-10
Jo
n
athan
N
i
e
der
Introduce usagef(
)
that tak
e
s
a printf-
s
tyle format
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan Nieder
Le
t
'
g
it
<command> -
h
' s
h
ow u
s
age without a git dir
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-10
J
o
nathan Nieder
Show usage string
f
or 'git http-push
-h
'
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan Nieder
L
et 'git
h
ttp-f
e
tch -h' show usage outside
any git
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-10
Jonatha
n
Nie
d
er
Show usage string for '
g
it stri
p
space
-h
'
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan N
i
eder
Sho
w
usage
s
trin
g
for 'git
u
n
pack-fi
l
e -
h
'
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-10
Jonath
a
n Nieder
Show usag
e
stri
n
g for
'
git show
-
index -h'
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan
N
i
e
de
r
Show usage s
t
r
ing for 'git r
e
v-pa
r
se -h'
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan Ni
e
der
Show usage stri
n
g for
'
git merge-on
e
-file -h'
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-10
Jo
n
athan
N
ieder
S
h
ow usag
e
string for 'g
i
t mailsplit
-h'
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-10
J
onatha
n
Niede
r
S
h
o
w
usa
g
e string for 'gi
t
imap-se
n
d -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 'gi
t
get-t
a
r-co
m
mit-id
-h'
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-10
Jo
n
athan Nieder
S
how usage
s
tring for 'git
fast-i
m
por
t
-h'
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-10
Jon
a
t
h
an Ni
e
der
Show us
a
ge string for 'git c
h
eck-r
e
f-fo
r
mat -h'
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan Nie
d
e
r
htt
p
-fetc
h
: add miss
i
n
g
initialization of
a
r
g
v0_pa
t
h
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-10
Jonat
h
an
N
ie
d
e
r
m
erge: do
n
ot setup worktree
twic
e
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-10
Jonatha
n
Nieder
c
h
eck-ref-format:
u
pdate usage string
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan Nieder
S
how
u
sa
g
e str
i
ng for 'git show-ref
-
h'
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-10
J
o
nathan Nieder
Show usage strin
g
for 'git
merge-ours -h'
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
next