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
t6038 (merge.renormalize): check that it can be turned off
2010-08-06
Jonat
h
an Niede
r
t6038
(
merge
.
renormalize):
che
c
k that it
c
a
n
be tur
n
ed off
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan Nie
d
er
t6038 (merge
.
re
n
ormalize): try checkout -m and c
h
erry
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-06
Jonat
h
an Nieder
t
6038 (merge
.
renormalize):
s
t
y
l
e
n
itpi
c
ks
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-14
Jonathan Nie
d
e
r
git-svn: strip
off leading sl
a
sh
e
s
o
n
--trunk a
r
gument
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-13
Jonathan Nieder
add-interac
t
ive: Clarify “r
e
mai
n
ing hu
n
ks in
t
he fil
e
”
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-11
J
o
n
athan
N
ieder
D
o
cume
n
t
ation/ch
e
ck
o
ut: cl
a
rify description
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-11
Jon
a
than Niede
r
r
e
base -i -p
:
document short
c
om
i
ngs
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-02
J
on
a
than
Nieder
DWIM 'git show -
5
'
to 'git show --do-wal
k
-5
'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-01
Jonathan
N
ie
d
e
r
gitign
o
r
e
.
5: Cla
r
i
f
y matchin
g
ru
l
es
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-01
Jonathan Nieder
rebase: improve error mes
s
a
g
e wh
e
n
upstream arg
u
ment
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-01
Jonathan Nieder
Doc
u
mentation/checkout: clarify d
e
scription
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-28
Jonathan Nieder
fsck: fix bogus com
m
it header check
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-20
Jo
n
a
than Nieder
A
dd git remote set-branche
s
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-20
Jonath
a
n Nie
d
er
post-receive-email: doc
u
ment com
m
a
n
d-line mode
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
Jonatha
n
Niede
r
git svn
:
a
v
o
i
d
uninitialized
var i
n
'r
e
set'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
Jonath
a
n Nieder
Makefile: let
h
eader de
p
endency checker override COMP
U
TE_HEA
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan
Ni
e
der
Make
f
ile:
fix header depe
n
dency check
e
r
t
o allow N
O
_CURL
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
Jonatha
n
Nie
d
er
Documentat
i
on/
n
o
tes: nitpicks
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan
N
ieder
Documenta
t
ion/
n
otes: clean up descri
p
tion of rewriting
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan N
i
e
d
er
D
ocumenta
t
io
n
/notes: simplify
treatment of default
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
J
o
nathan Nieder
Documentation/l
o
g: add a CONF
I
G
U
RA
T
ION secti
o
n
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan
N
ieder
D
ocumentation/notes: simplify
t
reatment of de
f
a
u
lt
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Nieder
Do
c
umenta
t
ion/no
t
es: add configu
r
a
t
ion
s
ectio
n
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Nieder
Do
c
u
men
t
a
tion/note
s
: de
s
crib
e
con
t
ent of notes
b
lob
s
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan
Nieder
D
ocumentatio
n
/notes:
d
o
cu
m
ent format of n
o
t
e
s trees
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-08
Jonathan Nieder
cher
r
y-pick: do
n
ot dump
c
o
re wh
e
n iconv fails
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-08
J
o
nathan
Niede
r
pretty
:
i
nitialize
new cmt_fmt_map
t
o 0
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-08
Jonatha
n
Ni
e
d
e
r
adapt r
e
qu
e
st-pull test
s
for
new pull re
q
ues
t
f
o
rmat
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-06
Jona
t
h
an Ni
e
der
test-lib: some shells d
o
n
ot l
e
t $? propag
a
te into
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-04
Jo
n
athan Nieder
shortlog: Document and test --format o
p
tion
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-04
J
o
n
at
h
an Nieder
t4201 (shortlog)
:
Tes
t
output fo
r
mat
with multiple
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-04
Jonat
h
a
n Ni
e
der
t
4201 (shor
t
log): guar
d
setup
with test_ex
p
ect
_
suc
c
ess
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-04
Jo
n
athan Nieder
Documentation/shortlog: scripted
users sho
u
ld not r
e
ly
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-04
Jo
n
atha
n
Nie
d
er
commit --
a
mend: cope w
i
th missing display name
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-04
Jo
n
a
t
h
an Nieder
t
est-lib: L
e
t
tests specify commands to be
run at end
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-01
J
o
nathan Nied
e
r
f
sck: check id
e
n
t line
s
in
c
ommit objects
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-01
Jonathan Ni
e
der
request
-
pull: protect
a
g
a
i
nst O
P
T
I
ONS_KEEP
D
A
SHDASH
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-01
Jonat
h
an Nieder
tests for reques
t
-pull
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-22
Jonathan Niede
r
Documenta
t
ion
/
M
a
kefi
l
e: f
i
x interr
u
pted builds of us
e
r
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-20
Jonathan Niede
r
fi
x
"bundle --stdin" segfault
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-20
J
onathan Nieder
t5704 (bundle): add
t
e
sts for bund
l
e
-
-stdin
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-17
Jonat
h
an
Nieder
tag -v: use RUN_GIT_CMD
t
o
r
u
n
v
eri
f
y-tag
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-15
Jonatha
n
N
i
eder
D
o
cumen
t
new "
a
lre
a
dy-m
e
rge
d
" rule
f
or b
r
anch
-
d
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-15
Jon
a
than Nieder
Add
.
d
e
pen
d
dire
c
tories to
.
g
i
tignore
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-15
Jonath
a
n Nieder
t7006:
guard c
l
eanup wit
h
test_expec
t
_s
u
cce
s
s
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-13
Jonathan
Ni
e
der
t5
8
00: testgit
h
elper requires Python
s
upport
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-11
J
o
nathan Ni
e
der
t740
0
: cl
a
rify submodule
u
pdate
tests
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-11
Jonathan Nieder
t7400: clar
i
fy 'submo
d
ule
a
d
d
' tests
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-11
Jonathan Nieder
t740
0
:
spl
i
t setu
p
in
t
o multiple tests
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-04
Jonathan Nied
e
r
Teach mailinfo %< as an alternative scissors m
a
rk
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-03
Jonathan Nie
d
er
Makefile: fut
u
re-
p
roof
C
y
gwin versi
o
n
che
c
k
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan
Nie
d
er
merg
e
-
r
ecursive: add
a
label for ances
t
or
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonath
a
n Nied
e
r
cherry-pick, revert: add a l
a
bel for ancestor
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
revert:
cl
a
ri
f
y label on confli
c
t hunks
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jo
n
athan Nieder
compat: add mempcpy()
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
J
onatha
n
Nieder
checkou
t
-m --confli
c
t=diff3: add a label for ance
s
to
r
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
mer
g
e
_
trees(): add ance
s
tor
lab
e
l para
m
eter for diff
3
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonat
h
an Nie
d
e
r
merge_fi
l
e
(
): add comment ex
p
l
a
in
i
n
g behav
i
or
wr
t
confl
i
ct
.
.
.
commit
|
commitdiff
|
tree
2010-03-21
Jonat
h
an Nie
d
er
checkout --conflic
t
=diff3: add a label for a
n
c
estor
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jon
a
than Nie
d
e
r
ll_merge(): add
ancestor labe
l
p
a
rameter for diff3
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
merge-fil
e
--diff3
:
ad
d
a label f
o
r ancestor
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jon
a
th
a
n Nieder
xdl_merge():
m
ove
f
i
le1
and file2
l
abels to xmparam
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonatha
n
Nieder
xdl_merge(): a
d
d optional ancestor label
to diff3-style
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
J
onathan Nieder
tests
:
d
o
cument cherry-
p
i
ck be
h
avior in face of conflicts
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonatha
n
Ni
e
d
er
tests: document for
m
at of conflicts from checkout
-
m
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jo
n
a
t
h
a
n Nieder
revert: fix tiny mem
o
r
y
leak i
n
c
herry-
p
ick --f
f
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-20
Jonathan Niede
r
Ma
k
ef
i
le: Fix
occasional
G
I
T-CFLAGS
b
reakage
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-20
Jonat
h
an Nieder
M
a
k
ef
i
l
e
: Fix CDPATH p
r
ob
l
em
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-20
Jonathan Niede
r
git
k
:
Do
n
'
t
clobber "
R
eme
m
ber this view
"
settin
g
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-20
J
onathan
N
ieder
gitk: Add comments to explain
e
ncode_view_opts
a
nd
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-28
J
onath
a
n Nie
d
e
r
Ma
k
efile: clarify definition of TE
S
T_
O
BJS
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-23
Jonath
a
n Nie
d
e
r
am:
remove re
b
ase-a
p
p
l
y
d
i
rectory
before gc
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-22
Jonatha
n
Nied
e
r
tests: F
i
x
race condition i
n
t7006-pager
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-21
Jona
t
han Nieder
t7006-
p
ager: if
s
t
d
out
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
i
eder
tests: Add tests for
a
utomatic use of pager
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-15
Jonat
h
an Nieder
am: Fix launchin
g
of pager
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-15
Jo
n
ath
a
n Nieder
git s
v
n:
Fix launching of pager
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-15
J
o
nathan Nie
d
er
g
i
t
.
1: Clar
i
f
y
t
h
e behavior
o
f the --pagin
a
te option
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-15
Jonath
a
n Nieder
Make
'
gi
t
var GIT_PAG
E
R' always print the configured
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-15
Jonathan N
i
eder
Fix 'git v
a
r' usage
s
y
nop
s
is
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-31
Jon
a
than Ni
e
der
M
a
k
efile: always remo
v
e
.
depend directories o
n
'make
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-31
Jonathan N
i
eder
M
a
k
efi
l
e:
tuck away gene
r
a
t
ed makefile fragments in
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-31
Jo
n
ath
a
n Niede
r
D
o not install shell libra
r
ies execu
t
able
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-27
Jonathan
N
i
eder
Teach Makefile to check head
e
r
dependencies
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-27
Jonathan Ni
e
der
Makefile: list stand
a
lone progr
a
m obj
e
ct files i
n
PR
O
GRAM_OBJS
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-26
Jonat
h
a
n
N
ieder
Makefil
e
:
lazily compute header dependencies
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-26
Jonath
a
n Nieder
Makefile
:
list
g
enerated obj
e
c
t files in OBJECTS
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-26
Jona
t
han Nieder
Mak
e
fi
l
e: disable defa
u
lt implici
t
rules
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-26
J
onathan Niede
r
M
akef
i
le: rearr
a
nge depende
n
cy rules
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-26
Jonathan Nieder
Makefile: trans
p
ort
.
o depends
on branch
.
h no
w
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-26
Jonathan Nie
d
er
Merge br
a
nch 'ma
s
t
e
r' o
f
g
i
t://repo
.
or
.
cz/alt-gi
t
into
.
.
.
commit
|
commitdiff
|
tree
2010-01-26
Jon
a
t
han Nie
d
er
M
a
kefile: dro
p
d
e
pend
e
ncy on $
(
wildcar
d
*/
*
.
h)
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-26
Jonathan
N
ieder
Ma
k
efi
l
e: clean up ht
t
p-
w
alker
.
o depende
n
cy
rul
e
s
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-26
J
onathan Niede
r
Makefile: r
e
mo
v
e wt-
s
tatus
.
h fr
o
m LIB_H
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-26
Jonat
h
an Nieder
Makefile:
m
ake
s
ure test helpers are r
e
built
w
hen head
e
rs
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-26
Jonath
a
n Nieder
M
ake
f
ile: ad
d
mi
s
sing
h
eader file dependencies
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-24
Jon
a
than Nie
d
er
Documentation:
merge: use MERGE_H
E
AD
t
o
refer to t
h
e
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-24
J
o
nath
a
n Nieder
Documenta
t
ion: sim
p
l
ify How Me
r
ge
Works
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-24
Jo
n
athan Nied
e
r
Doc
u
men
t
ation: merge: add a
secti
o
n
about fast-forward
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-24
Jo
n
athan Nieder
D
ocument
a
ti
o
n: emphasize when git merge
termina
t
es
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
next