repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Documentation/notes: document format of notes trees
2010-05-09
Jonathan
N
ied
e
r
D
ocumentation
/
notes: d
o
cument f
o
rm
a
t of notes trees
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-22
J
o
n
ath
a
n Nieder
Docume
n
tation
/
Makefile
:
fix inte
r
rupte
d
builds
o
f user
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-17
Jonathan Ni
e
der
tag -
v
: use RUN_GIT_C
M
D to ru
n
verif
y
-tag
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-15
Jonathan Nieder
Document new "alre
a
dy-merged"
rule for bra
n
ch -d
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-15
J
o
nathan Nie
d
er
Add
.
depend dire
c
tories to
.
g
it
i
g
n
o
r
e
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-04
Jonathan
N
ieder
T
e
ac
h
ma
i
linfo %
<
as an alternative
sciss
o
rs mark
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-03
Jo
n
athan Nieder
Makef
i
le: future-pro
o
f C
y
gwin versio
n
check
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
J
o
nathan
Ni
e
der
merge
-
re
c
ur
s
ive: a
d
d a labe
l
for ancestor
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonat
h
an Nieder
cherry-pick,
revert: a
d
d a label
f
or ancestor
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonath
a
n Ni
e
d
er
re
v
e
rt: c
l
arify lab
e
l
o
n
c
o
nflict hunks
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonatha
n
Niede
r
compat: add memp
c
py()
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Niede
r
ch
e
c
k
out -m
-
-
conflict=diff3: a
d
d a label for anc
e
stor
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
J
o
n
a
th
a
n Nieder
merge_tre
e
s(): add a
n
c
est
o
r label paramete
r
for d
i
ff3
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan
Nieder
mer
g
e_file(): add comment explaining behavior wrt conflic
t
.
.
.
commit
|
commitdiff
|
tree
2010-03-21
Jonath
a
n Nied
e
r
checkout --conflict=diff3: add a label
f
or
ancestor
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonatha
n
Nied
e
r
l
l_merge(): add ancest
o
r la
b
el
p
arameter for diff3
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
J
o
na
t
han N
i
eder
m
e
r
g
e-fil
e
--dif
f
3
: add a l
a
b
e
l for ances
t
o
r
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan N
i
eder
xdl_merge(): move fil
e
1
a
nd
f
i
le2 la
b
els t
o
xm
p
ara
m
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
x
d
l_merge()
:
add o
p
ti
o
na
l
ance
s
t
or label t
o
d
iff3-style
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
t
e
sts: d
o
cument ch
e
rry
-
pick beh
a
vior in face of conflicts
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan
N
i
e
der
tests:
d
ocument
format of conflicts from
checkout
-
m
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan N
i
e
der
revert:
f
i
x
tiny mem
o
r
y
leak in cherr
y
-pick --ff
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-20
Jo
n
a
t
han Nieder
Makefi
l
e:
Fix occasion
a
l GIT-C
F
LAGS bre
a
kage
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-20
Jonath
a
n N
i
ede
r
Makefile: Fix CDPATH pro
b
lem
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-20
Jona
t
han Nieder
gitk: Don'
t
c
lobbe
r
"Remember th
i
s
view"
setting
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-20
Jonathan Nieder
gitk: Add comments to e
x
plain encod
e
_
view_op
t
s an
d
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-28
Jonath
a
n
Nieder
M
akefile
:
clar
i
fy d
e
fini
t
ion o
f
T
E
ST
_
O
BJS
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-23
Jon
a
than N
i
eder
am
:
remo
v
e
r
ebase-
a
pply
directory be
f
ore gc
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-22
Jonathan Nieder
tests
:
F
i
x
race condit
i
on
in t7006
-
pager
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-21
Jonathan Nieder
t
7006-pag
e
r
:
if stdou
t
i
s not a terminal, m
a
ke a new
o
ne
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-20
Jonat
h
a
n
Niede
r
tests
:
Add tests for
a
utomatic use of pag
e
r
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-15
Jonathan Nieder
am:
Fix l
a
un
c
hing of pager
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-15
Jonathan
Nie
d
er
g
i
t
s
vn: Fix launching of pager
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-15
J
o
nathan
N
ied
e
r
gi
t
.
1: Clarify the beh
a
vior of the --paginate option
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-15
J
o
nathan Nieder
Make 'g
i
t var
GIT_PAGER'
alway
s
pri
n
t th
e
c
onfigured
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-15
J
onathan Nieder
F
i
x 'git var' usage synopsis
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-31
Jonathan
N
i
eder
Makefile: always
remo
v
e
.
depend directori
e
s on
'
ma
k
e
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-31
Jonath
a
n Ni
e
d
er
Makefile: tu
c
k away
g
enerated make
f
ile fragments
in
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-31
Jo
n
a
t
ha
n
Nieder
Do not
install shell librari
e
s
ex
e
cutab
l
e
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-27
Jonathan
N
ied
e
r
Teach Makefile to check header de
p
endencies
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-27
J
onathan Niede
r
Makefile: list standalone program
object files in PROGRAM
_
OBJS
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-26
Jonathan Niede
r
Makef
i
le: lazi
l
y compute hea
d
er
d
e
pendenc
i
es
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-26
Jonath
a
n
Nieder
Ma
k
e
file
:
list generate
d
obj
e
c
t
f
ile
s
i
n OBJEC
T
S
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-26
Jon
a
than Nieder
Makefile: disa
b
le default imp
l
icit rules
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-26
Jonathan Nieder
Makefile
:
rear
r
ange depe
n
de
n
cy rules
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-26
J
o
nath
a
n Nieder
Makefile: transport
.
o depend
s
o
n
bra
n
ch
.
h
n
ow
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-26
Jon
a
than N
i
e
d
er
Merge branch
'maste
r
'
of git:
/
/rep
o
.
or
.
cz/alt-git
i
n
t
o
.
.
.
commit
|
commitdiff
|
tree
2010-01-26
Jonathan Nieder
Makefile
:
drop dependency
o
n $(wil
d
c
a
rd */*
.
h)
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-26
J
on
a
than Ni
e
d
e
r
M
akefile
:
c
lean up htt
p
-w
a
lker
.
o
depe
n
dency
r
ules
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-26
Jonathan Niede
r
M
a
kefile
:
r
e
m
ove wt-status
.
h from LIB_H
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-26
Jonathan Nieder
Makefile: make sure tes
t
helpers are r
e
built when head
e
rs
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-26
Jon
a
than Nie
d
er
Makefile:
add
m
issing header file de
p
en
d
e
ncies
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-24
J
onathan Nieder
Documentati
o
n
: merge: use MERGE_HEAD
t
o refe
r
to the
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-24
Jonathan Nieder
Documentation: simplify How
Merge Works
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-24
J
on
a
than
N
ieder
Docu
m
entatio
n
: merge:
a
dd a sec
t
ion a
b
out fast
-
forward
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-24
Jona
t
h
a
n
Nie
d
e
r
Documentatio
n
: emp
h
a
s
ize whe
n
git merge t
e
r
m
in
a
tes
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-24
Jonathan Nieder
Documentation:
merge: add a
n
overview
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-24
Jonathan Nieder
Docu
m
e
n
tation:
m
erge: move me
r
ge strateg
y
list to end
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-24
J
o
n
athan
N
i
e
d
e
r
Docu
m
entatio
n
:
suggest
`reset -
-
merge` in How Mer
g
e
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-24
Jonatha
n
N
ieder
Do
c
um
e
ntation: m
e
rge:
mo
v
e configuration
se
c
tion to en
d
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
Jo
n
athan
N
ie
d
er
Documentation: tiny git config
ma
n
ual t
w
eak
s
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
Jona
t
ha
n
Nieder
Document
a
tion: git
g
c packs refs by defau
l
t n
o
w
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
Jonathan
N
i
eder
Document
a
tion: ti
n
y git config manual tw
e
aks
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
Jonat
h
an Nieder
Documentatio
n
:
git gc p
a
cks
refs by defaul
t
now
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-07
J
o
na
t
han Ni
e
der
git-gui: Ma
k
efile: consolidate
.
FORCE-* targets
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-06
Jonatha
n
Nieder
Makef
i
le: consolidate
.
FORCE-* targets
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-06
J
o
nathan Nie
d
er
Makefi
l
e: lear
n
to generate li
s
tin
g
s f
o
r
t
argets r
e
quir
i
ng
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-06
Jonathan Nieder
Make
f
ile: u
s
e target-s
p
ecific variable to pass flags
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-06
Jonathan
Nie
d
er
Makefile: regenerate assembler listings wh
e
n
a
sked
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-06
Jon
a
t
h
an Nieder
M
a
kefile:
ma
k
e
ppc/
s
ha1ppc
.
o dep
e
nd on GIT-CFLAGS
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-28
Jonathan Nieder
Makefile: do no
t
clean arm d
i
rectory
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-18
Jonathan Nieder
Speed up
b
a
sh completi
o
n loa
d
ing
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-13
J
o
n
athan Nieder
Provide a
b
ui
l
d
t
i
me d
e
fau
l
t
-
e
d
itor setting
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-13
Jonath
a
n
Nieder
a
m
-i
,
git-s
v
n:
u
se "git var G
I
T_PAGER"
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-13
Jonathan
N
ieder
a
d
d
-
i
,
sen
d
-
ema
i
l, svn, p4, etc: use "git
var GIT_EDITOR"
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-13
Jonathan N
i
ed
e
r
Te
a
ch git v
a
r
about GIT
_
PAGE
R
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-13
Jonathan Nieder
Teach git v
a
r about GIT
_
EDITOR
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-13
Jonathan
Nieder
Supp
r
ess warnin
g
s fro
m
"git
var -l"
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-13
Jonathan Nieder
Do not use V
I
SUAL
e
d
i
to
r
on dumb terminals
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
J
o
nathan Nied
e
r
diff --n
o
-index: make the usage string l
e
ss scary
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
J
o
n
a
than Nieder
merge-{recu
r
sive,sub
t
ree
}
: us
e
usagef() to
p
rint usage
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonat
h
an Nieder
Intr
o
duce usage
f
() that t
a
kes a
printf-style form
a
t
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonatha
n
Nieder
Let 'git <command> -h
'
show usage
w
itho
u
t a git
dir
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan Nieder
Show usage string for 'git http-
p
ush -h'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan N
i
eder
L
et
'git
h
ttp
-
fetch -h'
s
h
ow usage
o
utside any git
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan Nieder
Show us
a
ge string
f
o
r
'git stripspa
c
e -h'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonat
h
an Ni
e
de
r
Show usage string fo
r
'git unpa
c
k-file
-h'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonat
h
an
N
iede
r
Show
u
s
a
ge string for 'git show-ind
e
x -h'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
J
o
nathan Nieder
Sh
o
w usag
e
s
tring for 'gi
t
rev-parse -h'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan Nieder
Sh
o
w
u
s
age str
i
ng for 'git me
r
ge-one-file -h'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
J
onathan Nieder
Sho
w
usage string
for 'git mails
p
lit
-
h'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
J
o
nat
h
an
N
ieder
Show usage
strin
g
fo
r
'
g
it imap-send
-
h'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan Nieder
S
h
ow usage string
f
or 'git get-tar-commit-id
-
h'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonatha
n
N
ieder
Show usage stri
n
g
for 'gi
t
fast-
i
mport -
h
'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan Nie
d
er
Show usage string for 'git check-ref-for
m
at -h'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonatha
n
Nieder
http-fetch: ad
d
mis
s
ing initializa
t
ion
of argv0_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
Jonathan Nie
d
er
c
he
c
k-ref-format: u
p
d
a
te usage string
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan N
i
ed
e
r
Show usage
s
t
ri
n
g for 'gi
t
show-
r
ef -h'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan Nied
e
r
Show u
s
a
ge stri
n
g
fo
r
'git merge-ours -h'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
next