repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
t/README: document more test helpers
2010-07-07
Jonathan Nieder
t/README: d
o
cument more test helpers
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-14
Jo
n
a
t
han Nieder
git
-
svn: st
r
ip off leading slashes on --
t
ru
n
k argument
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-13
Jon
a
than Nie
d
e
r
add-inter
a
c
tive: Clari
f
y
“
remaining hunks in t
h
e file”
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-11
J
o
nathan Ni
e
der
Doc
u
m
e
ntation/checkout:
c
l
arify
d
esc
r
ipti
o
n
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-11
Jo
n
a
t
han Ni
e
der
rebase -i -p: documen
t
shortcomings
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-01
J
on
a
tha
n
Nieder
g
i
tignore
.
5: Clarify
m
a
tching r
u
l
es
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-01
Jona
t
han
N
i
ed
e
r
reba
s
e: improv
e
e
r
ror message when upstream argument
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-01
Jonathan N
i
eder
D
o
cu
m
entation/checkou
t
: clar
i
fy description
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-28
Jo
n
athan Nieder
fsck: fix
bog
u
s com
m
i
t
header ch
e
ck
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-20
Jo
n
athan Nie
d
er
Add git remo
t
e
se
t
-branches
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-20
Jonathan Ni
e
der
post-receiv
e
-email: d
o
c
u
ment c
o
mm
a
n
d
-line mo
d
e
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
Jonath
a
n
Nied
e
r
git svn: avoid unini
t
ialized
var in 'reset'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
Jo
n
athan Niede
r
M
a
k
efi
l
e:
l
et head
e
r d
e
pende
n
cy checker ov
e
rride COMP
U
T
E
_HEA
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan
N
i
ed
e
r
M
a
kefile: fix header
d
ependen
c
y checker to
a
l
l
ow NO_CURL
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
J
onathan Niede
r
Documentation/not
e
s: ni
t
picks
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
Jo
n
athan Nieder
Documentation/n
o
tes: clean up
d
escr
i
ptio
n
of r
e
wr
i
ti
n
g
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
Jo
n
athan Nie
d
er
Documentation
/
notes:
simp
l
ify
t
rea
t
ment of def
a
ul
t
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
Jonat
h
an N
i
ede
r
Docume
n
tation/log: add a CONFI
G
UR
A
TION section
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
J
o
nat
h
a
n Nie
d
er
Docu
m
entation/notes: simplify treatment o
f
d
e
fault
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
J
o
nathan Nieder
Doc
u
menta
t
ion/notes: add
c
on
f
iguration s
e
cti
o
n
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Nieder
Docu
m
entat
i
on/notes: des
c
ribe conten
t
of notes blobs
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan
N
ieder
Docum
e
n
t
ati
o
n/notes:
d
ocument format of notes trees
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-08
Jonat
h
an Nieder
cherry-
p
ick: do not d
u
mp core when
iconv
fails
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-08
J
onathan Nieder
pretty: initiali
z
e new
cmt_fm
t
_map to 0
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-08
Jonathan Nie
d
er
adapt
req
u
est-pull
t
ests for new pull
request forma
t
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-06
Jonathan
N
ieder
t
e
st-li
b
: some
s
hel
l
s do not let
$? pr
o
pa
g
ate into
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-04
Jonat
h
a
n N
i
eder
s
h
ortlog: Document and test --format
option
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-04
Jonathan Nieder
t4201 (short
l
og): Test output
f
o
rmat w
i
th multiple
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-04
Jonathan Nieder
t420
1
(shortlog): gu
a
rd
s
etup with test_expect_success
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-04
Jonath
a
n N
i
ede
r
Documen
t
ation/
s
ho
r
tlog: scripte
d
users shoul
d
not
r
el
y
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-04
Jonat
h
an
Nieder
commit --ame
n
d
:
cope wi
t
h
missin
g
display n
a
m
e
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-04
Jonat
h
an Nieder
test-lib: Let t
e
sts s
p
ecify
c
ommands to be run at end
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-01
Jonat
h
a
n Nieder
fsck: check ident l
i
n
es in commit objects
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-01
Jonathan Nieder
request-pull
:
prote
c
t
a
g
ain
s
t OPT
I
ONS_KEEPDASHDASH
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-01
Jonathan
Nieder
test
s
for request-pul
l
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-22
J
o
na
t
han Nieder
Documentation/Makefile
:
fix
interrupte
d
builds of user
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-20
Jonathan Nieder
fi
x
"
b
undle -
-
std
i
n" segfault
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-20
J
onat
h
an Nie
d
e
r
t5704 (bundle): add tests for
bundle -
-
s
t
din
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-17
Jonat
h
an Nieder
tag -v: use RUN_GIT
_
CMD to ru
n
verify
-
tag
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-15
J
o
n
athan
Nied
e
r
Doc
u
ment new "already-merged" r
u
le for branch -d
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-15
Jonathan Nieder
Add
.
depend di
r
ectories to
.
gitignore
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-15
Jonathan Ni
e
der
t
7
0
0
6: g
u
ard cleanup
with t
e
st_expect_success
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-13
Jonat
h
an Nieder
t5800: testgit helper requi
r
es Python support
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-11
Jonathan
Nieder
t74
0
0
:
clarify submodul
e
update test
s
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-11
J
o
n
at
h
an Nieder
t7400: clarif
y
'submodule add' tests
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-11
Jonat
h
an Nieder
t7400: split
s
et
u
p in
t
o multi
p
le tests
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-04
J
o
n
atha
n
Nied
e
r
Teach ma
i
li
n
f
o
%< as
a
n a
l
ternative sciss
o
rs mark
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-03
J
o
nat
h
an
Nieder
Makefi
l
e: future-proof Cygwin version
c
heck
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan
N
ieder
merge-recu
r
sive:
add a label
for ancestor
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonat
h
an Nieder
cher
r
y-pick, re
v
e
r
t
:
add a label
f
or ancestor
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Ni
e
der
r
e
vert:
clar
i
fy l
a
b
el on conflict hunk
s
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
compa
t
: add mempcpy()
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
J
o
n
a
than Nieder
checkout -m --conflict=diff3
:
add a label for ancestor
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonath
a
n Nieder
merg
e
_tr
e
es(): add ancestor label paramete
r
for di
f
f3
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
J
onathan Nieder
mer
g
e_f
i
le():
ad
d
comment explaining behavior
w
r
t
conflic
t
.
.
.
commit
|
commitdiff
|
tree
2010-03-21
J
onatha
n
Nieder
checkout --confl
i
c
t
=diff3: add a la
b
el for ance
s
tor
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonat
h
an Nieder
ll
_
m
e
rge():
a
dd ance
s
tor label parameter for
d
iff3
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
J
o
nathan Nieder
merge-fil
e
--diff3: add a
l
abel fo
r
ancestor
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
J
onathan Niede
r
xdl_merge(
)
:
move file1 and fi
l
e2 labels to
x
m
para
m
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jo
n
athan
Nieder
xd
l
_merge():
add optional ancestor label
t
o
di
f
f
3
-style
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan N
i
eder
test
s
: document cherry-pick
b
e
h
a
vior in
face
of conflicts
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jo
n
at
h
an Nieder
tests
:
docume
n
t format of confli
c
ts fr
o
m checkout -
m
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
J
o
n
athan
N
ieder
revert: fix
tiny memor
y
leak in cherry-pick --ff
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-20
Jo
n
athan
Nieder
Make
f
ile: Fix oc
c
asional GIT-CFLAGS breakage
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-20
Jonathan
Nieder
Makefile:
Fix
CDPATH pro
b
lem
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-20
J
o
na
t
ha
n
Nieder
gitk: Don
'
t clobbe
r
"
R
e
m
e
mber this view"
se
t
t
i
ng
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-20
J
onathan
N
ied
e
r
gitk: Add
comm
e
n
ts to explain encode_view_o
p
ts and
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-28
Jo
n
a
t
han Nieder
Makefile: c
l
a
r
i
f
y
def
i
nition of TEST_OBJS
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-23
Jonathan Nieder
am: remove rebas
e
-
a
p
p
ly d
i
rectory before
g
c
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-22
Jon
a
than Ni
e
d
er
tests:
F
ix race
co
n
dition in t7006-pager
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-21
J
onathan Nie
d
er
t70
0
6
-
pager: if st
d
out is not a ter
m
i
n
a
l, make a new
o
n
e
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-20
Jo
n
athan Nied
e
r
tests: A
d
d tests for autom
a
tic use of page
r
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-15
Jo
n
ath
a
n Nieder
am: Fix l
a
u
nch
i
ng
of pager
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-15
Jonathan N
i
e
d
er
git
svn: Fix launching of pag
e
r
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-15
Jonathan
N
i
e
d
e
r
git
.
1
: Clarify the behavior o
f
the --p
a
gina
t
e
o
pt
i
on
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-15
Jonathan N
i
e
d
er
Make 'gi
t
v
a
r
GIT_PAGER'
a
lw
a
ys pr
i
nt the conf
i
gured
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-15
J
o
n
athan Nied
e
r
F
ix 'git
var' usage synopsis
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-31
Jonathan
N
ie
d
er
M
akefile: al
w
ays re
m
ove
.
depend di
r
ectories on 'm
a
k
e
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-31
J
onat
h
an Nie
d
er
Makefile: tuck away generated makefile fragments in
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-31
Jonathan Nieder
Do not install shell libra
r
ies exec
u
table
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-27
Jonath
a
n
Nied
e
r
Teach Make
f
ile to
c
heck
h
eader dependen
c
ies
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-27
Jona
t
h
a
n Nieder
Makefile:
l
ist
s
tandalone program
o
bject files i
n
PROGRAM_OBJS
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-26
J
o
na
t
han N
i
eder
M
akefile
:
lazily compute
header
d
ependencies
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-26
Jonatha
n
Nied
e
r
Ma
k
e
f
ile
:
l
ist generated obj
e
ct files in
O
B
JE
C
TS
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-26
Jonatha
n
Nieder
Makef
i
le: di
s
a
b
le default i
m
pl
i
cit rules
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-26
Jonathan N
i
eder
Make
f
ile: rearrange d
e
pe
n
den
c
y rul
e
s
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-26
Jon
a
than Ni
e
de
r
Makef
i
le: tra
n
sport
.
o
depends on b
r
anch
.
h now
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-26
J
onat
h
an
Nieder
Merge bra
n
ch 'master' of
git
:
//re
p
o
.
or
.
cz/alt-git
into
.
.
.
commit
|
commitdiff
|
tree
2010-01-26
Jon
a
than Nieder
Mak
e
fil
e
: drop dependency
on $(wildcard */*
.
h)
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-26
Jonathan
Nieder
M
ake
f
il
e
: clean up http-
w
alker
.
o de
p
enden
c
y r
u
les
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-26
J
o
nathan Niede
r
Makef
i
le:
r
emove
w
t-st
a
tus
.
h f
r
om LIB_H
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-26
Jonat
h
an Niede
r
Makef
i
le
:
make su
r
e
t
e
st hel
p
ers are rebuil
t
w
hen he
a
ders
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-26
Jonathan Nieder
M
a
kefile: add mi
s
sing header fi
l
e dependenci
e
s
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-24
Jonathan N
i
eder
Documentation:
m
erge: use MERGE
_
HEAD t
o
r
efer to the
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-24
Jonathan Nieder
Do
c
um
e
ntation: simplify How Me
r
ge W
o
rks
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-24
J
o
n
a
than
N
ied
e
r
Documentation: me
r
ge: add a sec
t
io
n
ab
o
ut fast
-
fo
r
ward
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-24
J
onathan Nied
e
r
Documentation:
e
mphasize when git merge terminates
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-24
Jonathan Nie
d
er
Documentation: merge: add an
o
vervie
w
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-24
Jo
n
athan Nieder
Do
c
umentation: merge: move
merge str
a
t
egy li
s
t to end
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-24
Jonatha
n
Nieder
Docu
m
entation: suggest `reset --merge` in
How
M
erge
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
next