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
Updates from the list to 1.7.2 Release Notes
2010-06-29
Jonathan Nieder
r
e
v
ert
:
do not reb
u
ild argv on heap
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-14
Jona
t
h
a
n
Nieder
t3
5
08 (cherry-pick): futur
e
proof again
s
t
unmerged files
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-14
J
o
n
a
than Ni
e
der
g
it-s
v
n: strip off leading
s
lashes on --tr
u
nk arg
u
ment
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-13
Jonat
h
an Nieder
add-inte
r
active: Clarify “rema
i
ning hunks i
n
the file”
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-13
Jonathan Nieder
grep: refactor grep_objects lo
o
p
into
its own function
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-11
Jo
n
athan Nieder
Docu
m
entation/checkout: clari
f
y description
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-11
Jonathan Nieder
rebase -i -p: document
s
hortco
m
i
n
g
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-02
Jonathan Ni
e
der
DWIM 'git s
h
ow -5' to
'
g
it s
h
ow --do
-
walk
-5'
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-01
Jona
t
han
N
i
ed
e
r
gitignore
.
5: Clarif
y
matchin
g
rules
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-01
J
onathan Nieder
re
b
a
se: i
m
prove
e
rror message
w
hen upstream a
r
gument
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-01
Jonatha
n
Nieder
D
o
c
umentation/checkout: clarify description
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-28
Jonathan Nieder
fsck: fix bogus commit hea
d
er check
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-20
Jon
a
than Nieder
Add git remote
set-branches
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-20
Jonathan
N
ieder
post-receive-em
a
il: document co
m
mand-line mode
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jona
t
han Nieder
git svn
:
avoid unini
t
i
a
liz
e
d
var in 'reset'
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Niede
r
Ma
k
efile: le
t
header dependen
c
y checker overri
d
e COMPUTE_HEA
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Nieder
Makefile: fi
x
h
e
a
de
r
dependency checker
t
o allow NO_CURL
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Nieder
Documenta
t
ion/notes:
ni
t
picks
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan
N
ieder
Docume
n
tatio
n
/not
e
s: clean up desc
r
i
ption of rewriting
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
J
onathan N
i
eder
D
o
c
um
e
nt
a
tion/notes: simplify trea
t
me
n
t
o
f def
a
ult
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jo
n
a
than Nieder
Docume
n
tation/log: add a CONFI
G
URATION s
e
ct
i
on
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Nieder
Do
c
umentatio
n
/note
s
: simplify t
r
eatment of defaul
t
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
J
o
nat
h
an
N
iede
r
Documentat
i
o
n/notes: add configuration se
c
ti
o
n
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Nieder
Documentation/notes: de
s
cribe
c
ontent
o
f notes blobs
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
J
onathan Ni
e
d
e
r
Documen
t
ation
/
n
otes: document format
of
not
e
s trees
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-08
Jon
a
than Niede
r
c
herry-pick:
do not dump core
w
hen iconv fail
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-08
J
onathan Nieder
pretty: i
n
itiali
z
e
new
c
mt_f
m
t_
m
a
p to 0
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-08
J
o
na
t
h
a
n Nieder
adapt request-
p
ull tests for
new pull
r
equest format
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-06
Jo
n
athan Ni
e
der
t
e
st
-
lib: some shells
do no
t
let $?
p
ropagate into
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jo
n
a
than N
i
e
d
e
r
shortlog: Docu
m
ent and t
e
st
--format
option
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
J
o
nat
h
an Nieder
t420
1
(sh
o
r
t
lo
g
): Test output format with multiple
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jonathan
Ni
e
der
t42
0
1
(sh
o
rtlog): guard
setup wi
t
h test_expect_success
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jonathan Nied
e
r
Docum
e
nta
t
i
on/shortlo
g
: script
e
d users should not rel
y
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jon
a
than Nieder
commit --amend: cope
with
m
issing display name
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jo
n
at
h
a
n N
i
e
der
test-lib: Le
t
tests specify c
o
mmands to b
e
run
a
t en
d
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-01
Jonathan
Nieder
f
s
c
k
: check
ident lines in commit objects
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-01
J
onathan Nieder
request-pull
:
protect agains
t
O
PTIONS_KEEPDASHDASH
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-01
Jonathan Ni
e
d
er
t
e
st
s
for
requ
e
st-pull
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-22
Jonatha
n
Ni
e
der
Docum
e
nt
a
tion
/
Makefile
:
fix
i
nt
e
rrupted builds of
u
ser
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-20
Jonathan Nieder
f
i
x
"bundle --stdin"
s
egf
a
ult
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-20
Jonathan Nied
e
r
t5704 (bundle):
a
dd tests
fo
r
bundle
--std
i
n
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-17
Jonathan Nieder
tag -v: use RU
N
_
G
IT_CMD to
r
un verify-tag
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-15
Jonathan Nieder
Docu
m
ent new "already-m
e
rged"
rule for branch -d
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-15
Jonathan Nieder
Add
.
depend dir
e
cto
r
ies to
.
gitignore
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-15
Jonathan
Nieder
t7006: guard cleanup with te
s
t_expect_success
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-13
Jonathan Ni
e
d
e
r
t
58
0
0
: testgit helper requires Python su
p
port
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-11
J
ona
t
han Nieder
t740
0
:
cla
r
ify submodule
u
p
d
a
te tests
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-11
Jonath
a
n N
i
eder
t7
4
00:
cl
a
r
i
fy '
s
ubmo
d
u
le add' tests
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-11
Jonathan Nieder
t7400: split setup into
multi
p
le tests
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-04
J
o
n
a
than Nieder
Teach mai
l
info %< as
a
n
alternative
s
c
i
s
so
r
s
mark
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-03
J
onathan Nieder
M
akefile: future-proof
Cygwin vers
i
on
ch
e
ck
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jon
a
than Nieder
merge
-
recurs
i
ve: add a label for
anc
e
stor
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan
N
ie
d
er
c
h
e
rry-pick, r
e
vert: add a labe
l
f
o
r a
n
cestor
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nie
d
er
reve
r
t: clari
f
y lab
e
l
on co
n
flic
t
hunk
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan
Ni
e
der
c
ompat: a
d
d me
m
pcpy()
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
J
onathan Nied
e
r
che
c
k
out -m
-
-conflict=
d
iff3: add a label
for
a
n
c
es
t
o
r
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonatha
n
Ni
e
der
me
r
ge_tree
s
(
)
:
a
dd ancesto
r
label param
e
ter
f
or diff3
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonat
h
an Ni
e
de
r
merge_file(
)
:
a
d
d
c
o
mment explai
n
i
ng behavior wrt confl
i
ct
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@mgila.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan N
i
eder
checkout
-
-
c
o
nf
l
ic
t
=diff3: ad
d
a label
for a
n
cestor
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
J
onath
a
n
Niede
r
ll_merge(
)
: add ancest
o
r lab
e
l parame
t
er
for dif
f
3
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonat
h
an
N
ie
d
er
merge-file --diff3: a
d
d a labe
l
for ancesto
r
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jon
a
than Nieder
xdl_merge(): move file1 an
d
file2 lab
e
ls to xmpar
a
m
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
xdl_mer
g
e(): add option
a
l
ancestor lab
e
l to diff3-styl
e
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jon
a
t
h
an Nieder
t
ests: document cherry-pick beha
v
ior in face of conflic
t
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
te
s
ts:
d
o
cument
f
ormat of
c
onfl
i
cts from checkout -m
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Niede
r
revert: fix tin
y
mem
o
ry leak in ch
e
rr
y
-pick --ff
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-20
Jonathan Nieder
Makefile:
F
ix
occasi
o
n
al GIT
-
CFLAGS break
a
ge
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-20
J
onathan Nieder
M
akefi
l
e: Fi
x
CDP
A
TH
problem
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-20
Jonathan N
i
eder
gitk: Don'
t
c
lobber "
R
em
e
m
b
er this
vi
e
w" setting
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-20
Jonathan N
i
ede
r
g
itk: Ad
d
c
o
mments to ex
p
lain enc
o
de_view_opts
and
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-02-28
Jon
a
than Nieder
M
akef
i
le: c
l
a
rify definition of TEST_OBJ
S
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-02-23
Jonathan N
i
ede
r
am: rem
o
ve
r
ebase-apply
d
ir
e
ctory be
f
o
re gc
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-02-22
Jonath
a
n Nieder
t
ests:
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
t700
6
-
pager:
if s
t
d
o
u
t
is not a termin
a
l,
make a new one
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-02-20
Jo
n
athan Nieder
t
e
s
ts
:
Add tests fo
r
aut
o
matic use of
pager
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-02-15
Jonathan Niede
r
am: F
i
x launch
i
ng o
f
page
r
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-02-15
Jonathan Nieder
git
s
v
n
:
Fix launching
of pager
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-02-15
Jonathan Nied
e
r
git
.
1: Clarify
t
he behavior of the --
p
agi
n
ate option
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-02-15
Jonathan Nieder
M
ake 'git var
GIT_PAG
E
R' always print
t
h
e conf
i
gured
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-02-15
Jonathan Nieder
F
ix
'g
i
t var' usage synopsis
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-31
Jonathan
N
ieder
M
a
kefile: always remove
.
depend directories o
n
'ma
k
e
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-31
Jonathan Nieder
Makefile
:
t
u
ck
a
way gen
e
rated makefil
e
f
ragment
s
in
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-31
Jonathan
N
ied
e
r
Do not instal
l
shell
l
ibraries executabl
e
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-27
Jon
a
than N
i
eder
Teach Makefi
l
e to check header d
e
p
e
nden
c
ies
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-27
Jo
n
at
h
a
n
Nieder
Makefile:
li
s
t
standalone
program
o
bj
e
ct files in PROGRAM
_
OBJ
S
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-26
Jonathan Ni
e
der
Makefile: lazily
compute header depen
d
encies
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-26
Jonathan Nieder
Makefile: list generated object fil
e
s
in OBJECTS
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-26
J
onath
a
n Ni
e
der
Makefile: d
i
sable default i
m
plicit rules
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-26
Jo
n
athan Nieder
Mak
e
f
i
le:
r
earrange dependency
ru
l
es
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-26
Jonathan Nieder
Mak
e
file: transp
o
rt
.
o depends on
branch
.
h now
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-26
Jonath
a
n Nieder
Merge branch 'master'
o
f git://
r
epo
.
o
r
.
cz/a
l
t-git into
.
.
.
commit
|
commitdiff
|
tree
2010-01-26
Jonatha
n
Nieder
M
a
kef
i
le: drop dependency on $(wil
d
card */*
.
h)
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-26
Jonatha
n
Nie
d
e
r
Makefile
:
cle
a
n
u
p http-w
a
lker
.
o dependency rules
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-26
J
o
nath
a
n
N
i
ed
e
r
M
akefile:
rem
o
ve wt-s
t
atus
.
h f
r
o
m
LIB_H
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-26
Jon
a
t
h
an Nieder
M
akefile:
m
ake sure test helpers are rebu
i
lt
w
hen heade
r
s
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-26
Jonathan
Ni
e
d
er
Ma
k
efile:
a
dd miss
i
n
g
h
e
ader file depe
n
d
e
ncies
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-24
Jonathan
N
iede
r
Doc
u
ment
a
t
i
on:
m
erge: use MERGE
_
HE
A
D to
r
e
f
er to the
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-24
J
onathan Nieder
Documentation: simplify H
o
w
Merge
W
ork
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-24
Jonathan Nieder
D
o
cumentation: merge: add a sect
i
on about
f
as
t
-forward
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-24
Jo
n
a
tha
n
Nieder
D
ocumentatio
n
: emphasize when git
m
erge
t
e
r
mi
n
a
tes
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
next