repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
tests: local config file should be honored from subdirs of toplevel
2010-06-28
Jo
n
athan Nieder
te
s
ts: local config file should be ho
n
ored from subdi
r
s
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-28
J
on
a
than Nieder
t7006: test pager configuratio
n
f
or seve
r
al
git co
m
mands
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-28
J
onathan Ni
e
der
t7006 (
p
ager): introduce h
e
lp
e
r for par
a
m
e
t
e
rized tests
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-14
Jonathan Nieder
g
it-svn: st
r
i
p off
l
eadin
g
s
l
a
shes on --t
r
unk argument
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-13
Jonathan Nieder
add-interactive: Clarify “remai
n
ing hunk
s
in the file”
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-11
Jon
a
tha
n
Nieder
Documentation/c
h
e
ckout:
c
larif
y
descri
p
t
i
on
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-11
Jo
n
athan
N
i
e
d
e
r
r
e
base -i -p: document
sh
o
rtcomings
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-02
Jonatha
n
Nieder
DWIM 'git show -
5
' to 'g
i
t
s
h
o
w
--do-walk -5'
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-01
Jo
n
athan Nied
e
r
gitignore
.
5: Cl
a
ri
f
y
matching r
u
l
e
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-01
Jonat
h
an Ni
e
d
er
rebas
e
: improve error message when ups
t
rea
m
argument
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-01
Jo
n
at
h
an Nieder
Documentation/ch
e
ckout: clarify description
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-28
J
on
a
than Nieder
fsc
k
: fix bogus
c
o
mmit header
c
heck
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-20
Jonathan Nieder
Add git re
m
ote set-branches
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-20
Jonathan Niede
r
post-receive-email: document
c
ommand-line
m
ode
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan
N
ied
e
r
git sv
n
: av
o
id uninit
i
alized va
r
in
'r
e
set'
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Nieder
M
a
kefile: let head
e
r d
e
pendency checker overr
i
de COMPUTE_HEA
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jon
a
than
Nied
e
r
Makefile:
fix header de
p
endency checker to allo
w
NO_CUR
L
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan
N
ie
d
er
Documentation/notes: n
i
tp
i
cks
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan N
i
e
d
er
Document
a
ti
o
n/notes: clea
n
up de
s
cri
p
tion of rewriting
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jo
n
ath
a
n
Nieder
Doc
u
mentation/notes:
simplify treatme
n
t
of defaul
t
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
J
ona
t
ha
n
Nieder
Documentation/log: add a CONFIGURATION sec
t
ion
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan
N
ieder
D
ocumentation/notes: simplify treatment of default
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
J
onathan Nieder
Docume
n
tation/notes: add
c
onfiguration section
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jona
t
han Ni
e
der
Documentati
o
n
/notes: descr
i
b
e
conte
n
t of n
o
t
e
s
b
lobs
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Nieder
Docum
e
nta
t
ion/notes: docume
n
t format of notes trees
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-08
Jo
n
ath
a
n
Nied
e
r
cherry-pick: do
n
o
t
d
ump
c
ore w
h
en iconv
f
ails
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-08
Jonathan Niede
r
p
r
e
t
ty: initia
l
ize ne
w
cmt_f
m
t_map t
o
0
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-08
Jonathan
Nieder
adapt r
e
quest-pull tes
t
s for new
p
ull
r
equest for
m
at
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-06
Jonathan Nieder
test-lib: some sh
e
l
l
s d
o
not let $? propag
a
t
e into
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jonathan Nieder
shortlog
:
Document
a
nd
test --f
o
rmat op
t
ion
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jonathan Nieder
t
4
201
(shortlog):
Test
output format w
i
th
multiple
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jonathan Ni
e
der
t4201 (shortl
o
g):
g
u
ard s
e
tup with test_expect_s
u
ccess
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jonathan Ni
e
der
D
o
cu
m
e
n
t
a
t
i
on
/
shortlo
g
: scripted users should no
t
rely
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jonath
a
n Nie
d
er
c
ommit --amend: cop
e
with missing d
i
spl
a
y name
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jonat
h
an Nieder
te
s
t-li
b
: Let te
s
t
s
speci
f
y comm
a
n
d
s to be run at end
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-01
Jonathan
N
ieder
fs
c
k:
c
heck iden
t
lines i
n
commit
o
bjec
t
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-01
J
onathan Nied
e
r
request-pull: protec
t
ag
a
inst OPTIONS_KEEPDASHDASH
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-01
Jonathan Nieder
tests for re
q
uest-pu
l
l
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-22
Jonat
h
an Nied
e
r
Documentation/Ma
k
efile: fix interrup
t
e
d builds
o
f user
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-20
Jonathan Nieder
fix "bun
d
le
-
-s
t
din
"
segfault
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-20
Jo
n
athan
Nieder
t5704
(
bu
n
dle): add tests for
bundle --stdin
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-17
Jo
n
athan Nieder
tag -v: use RUN_GIT_CM
D
to
run verify
-
tag
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-15
Jonatha
n
Nieder
Document new
"
a
l
rea
d
y
-
merged"
r
ule for branc
h
-d
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-15
J
onathan Nieder
Add
.
depend dir
e
ctories to
.
giti
g
no
r
e
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-15
Jonathan Nied
e
r
t700
6
: gua
r
d clean
u
p
w
ith t
e
st
_
e
x
pect_succ
e
ss
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-13
Jonathan Nie
d
e
r
t
5
8
0
0: testg
i
t
h
elper requires P
y
thon support
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-11
Jonathan Nieder
t740
0
: clari
f
y submodule upda
t
e
t
e
st
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-11
J
o
n
a
than Ni
e
der
t7400: clarif
y
'
s
ubmodule
a
d
d
' tests
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-11
Jona
t
han N
i
eder
t7400: split
setup into multip
l
e tests
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-04
Jonathan Ni
e
der
T
each mailinf
o
%< as an alternative
s
cissors
m
a
rk
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-03
Jonathan Nieder
Makef
i
le: future-p
r
oof C
y
gwin v
e
rsion
c
heck
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jon
a
than
N
iede
r
merge-re
c
u
r
sive
:
add a label for ancestor
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
J
o
nath
a
n Nieder
cherry-pick, revert: add
a
la
b
el
f
o
r ancestor
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
r
e
v
ert: clarify l
a
bel on conflict hun
k
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan N
i
eder
c
o
mpa
t
: a
d
d m
e
m
p
cpy()
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
J
on
a
than
N
ieder
c
h
e
ckou
t
-m --conflic
t
=
d
iff3: add
a
label
for a
n
cestor
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jon
a
t
han Nie
d
e
r
merge_trees():
add a
n
c
esto
r
label param
e
ter
f
or diff3
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
merge_fi
l
e(): add comme
n
t explaining behavior wrt
c
o
n
flict
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@mgila.com>
commit
|
commitdiff
|
tree
2010-03-21
J
onatha
n
Nieder
checkout
-
-conflict
=
dif
f
3:
add a label for ancestor
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jona
t
han N
i
eder
ll_merge(): add ancestor labe
l
parame
t
er f
o
r diff3
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
merge-file --diff3: add a la
b
e
l
for ance
s
to
r
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonath
a
n Nieder
xdl_merge():
move file
1
and file2
labels to x
m
param
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jona
t
han Niede
r
xdl_merg
e
(): ad
d
optional
ancestor la
b
el t
o
diff3-style
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonatha
n
Nieder
tests: d
o
cum
e
nt cherry-pick b
e
ha
v
i
or in f
a
c
e
of
c
onflicts
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
t
ests
:
document format of conflicts f
r
o
m
checkout -m
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
revert: f
i
x tin
y
memo
r
y leak
i
n
cherry-pick --ff
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-20
J
o
n
athan
Nieder
Makefile: Fix occas
i
onal
GIT-C
F
LAGS
breakage
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-20
Jo
n
atha
n
Nied
e
r
Makef
i
l
e
: Fix
CD
P
ATH pr
o
b
l
e
m
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-20
Jonathan
N
i
eder
gitk: Don't clobber "R
e
member t
h
is view
"
s
e
ttin
g
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-20
Jonathan N
i
eder
gitk: Add comments to
e
x
p
lai
n
encode_view_opts
a
nd
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-02-28
Jonatha
n
Niede
r
M
a
kefile: cla
r
if
y
definition of
TEST_OBJS
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-02-23
Jo
n
at
h
an Ni
e
der
am
:
r
e
move
r
e
ba
s
e-app
l
y
d
irect
o
r
y
b
ef
o
re
gc
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-02-22
Jonathan Nieder
tests: Fix race condi
t
ion in t7006-pager
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-02-21
Jonath
a
n Nieder
t7006-pager: if stdout
is no
t
a terminal, make
a
n
e
w
one
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-02-20
Jonathan Nieder
t
es
t
s:
A
d
d
tests for automatic use of pager
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-02-15
Jonatha
n
N
i
eder
am: Fi
x
launching
o
f pager
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-02-15
Jonathan Nieder
g
it svn: Fix launching
of pag
e
r
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-02-15
Jonath
a
n
N
ie
d
er
git
.
1: Clarify the b
e
havio
r
o
f
the --pagi
n
a
te
o
pt
i
on
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-02-15
J
on
a
than Nieder
Ma
k
e 'git var GIT_P
A
G
ER' alwa
y
s print t
h
e con
f
igured
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-02-15
J
onathan Nieder
Fix
'
git v
a
r' u
s
age s
y
nopsis
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-31
J
onathan Niede
r
M
a
ke
f
ile: always remo
v
e
.
depend dire
c
to
r
ies o
n
'm
a
ke
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-31
Jonatha
n
Nied
e
r
Makefile: tuc
k
away generated mak
e
file
fragments
in
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-31
Jon
a
than Ni
e
de
r
D
o
not
i
nstall shell
l
ib
r
aries executabl
e
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-27
Jonat
h
an Nieder
Teach Makefil
e
to
check heade
r
d
ependencie
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-27
Jo
n
athan Nieder
Makef
i
le: list st
a
ndalone
p
r
o
gram ob
j
ect files
in PROGRAM
_
OBJS
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-26
Jonathan Nieder
Makefile: lazily c
o
mpute header depe
n
den
c
i
es
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-26
Jo
n
athan Nieder
Ma
k
efile: list gener
a
ted object
f
iles
in
OBJ
E
CTS
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-26
Jonath
a
n
Nieder
M
a
kefile: di
s
able defaul
t
im
p
licit
rules
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-26
Jonat
h
an Nieder
M
akefile: rear
r
ange dependency rul
e
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-26
Jo
n
athan Nieder
Makefile
:
tr
a
n
s
port
.
o depend
s
on
b
ranch
.
h now
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-26
J
on
a
than Nieder
M
e
r
ge
b
ranch 'mast
e
r' of git://repo
.
or
.
cz/alt-git into
.
.
.
commit
|
commitdiff
|
tree
2010-01-26
Jonathan Ni
e
der
Makefile: dr
o
p d
e
p
endency o
n
$
(
wildcard
*
/*
.
h
)
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-26
Jonathan
N
ieder
M
a
kef
i
le: clean up http-wa
l
k
er
.
o de
p
endenc
y
rules
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-26
Jonathan Nieder
Makefile: re
m
ove wt-status
.
h from LIB_H
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-26
J
onathan Nieder
Mak
e
fi
l
e: make sure test h
e
lpers are rebu
i
lt wh
e
n header
s
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-26
Jona
t
han Nie
d
er
Makefile:
add miss
i
ng head
e
r file
dep
e
ndencie
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-24
Jonathan
Ni
e
der
Documentati
o
n: merge: us
e
M
E
RGE_HEAD to refer to the
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-24
Jonat
h
an Nied
e
r
Documentation: simplify
H
o
w
Me
r
ge W
o
rks
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-24
Jona
t
han Nie
d
er
D
o
cumentation: merge: add a section
about fast-forward
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-24
J
o
nat
h
an N
i
eder
Doc
u
m
e
n
t
ation: emphasize when git merge terminates
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
next