repo.or.cz
/
alt-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'maint'
2010-06-29
Jo
n
a
t
h
an Nieder
rev
e
rt: do not
r
ebu
i
ld a
r
g
v on heap
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-14
Jonath
a
n
Nie
d
er
t3508 (cherry-pick): futureproof against unmerged files
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-14
Jonathan Niede
r
g
i
t-svn: strip off leading slashes on --trunk argument
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-13
Jona
t
h
a
n
Nieder
add-interactive:
Clarify “remai
n
i
ng hunks in th
e
fi
l
e”
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-13
Jon
a
than Ni
e
der
gre
p
: refactor grep_ob
j
ects loo
p
into its own fun
c
t
ion
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-11
Jonathan
Nieder
Doc
u
mentation/checkout:
c
lar
i
fy descrip
t
ion
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-11
Jo
n
athan
Nieder
rebase -i -
p
: document sho
r
tcomings
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-02
Jo
n
athan Nie
d
er
D
W
IM 'git
s
h
ow -5' to 'git show -
-
do-walk -5'
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-01
Jonath
a
n Niede
r
gitignore
.
5
: Clar
i
fy matching r
u
l
es
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-01
Jonathan Niede
r
rebase:
i
mprove
error message when upstream arg
u
ment
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-01
Jonathan
Nieder
D
o
cumentatio
n
/che
c
k
o
ut: c
l
arify desc
r
iption
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-28
J
onathan Ni
e
der
fsck: fix bogus commit head
e
r che
c
k
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-20
Jonathan Ni
e
der
Add git rem
o
te set-branches
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-20
J
onathan Nieder
p
ost-
r
ec
e
iv
e
-email: documen
t
command-line
m
ode
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jon
a
than Ni
e
d
er
g
i
t
svn: avoid uninitialized var
i
n
'r
e
set'
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonath
a
n Nied
e
r
M
a
k
efile
:
l
et
h
e
ader dependency ch
e
cke
r
override COMPU
T
E_HEA
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan
Niede
r
Make
f
i
le: fix hea
d
e
r
d
ependency check
e
r to allow
NO_CURL
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonath
a
n Ni
e
der
D
o
cumenta
t
i
o
n/notes: ni
t
p
ic
k
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
J
ona
t
h
a
n Nieder
Documentat
i
on/notes: clean up descriptio
n
o
f
rewriting
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jona
t
h
a
n Nie
d
er
Docu
m
en
t
at
i
on/notes:
s
i
m
plify tr
e
atment of
d
efault
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Nie
d
e
r
Doc
u
mentation/log: add a CONFI
G
URATION section
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan N
i
e
der
Do
c
u
mentati
o
n
/
no
t
e
s:
simplify tr
e
atment of default
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jo
n
athan Ni
e
d
er
Documentation/notes: ad
d
conf
i
gu
r
atio
n
section
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jona
t
han Nieder
Docum
e
ntation/notes: describe
content of notes blobs
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
J
o
nathan
N
ieder
Do
c
umentation/note
s
: document forma
t
o
f notes trees
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-08
Jona
t
han Nieder
c
herry-pick: do not dump core when icon
v
fails
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-08
Jona
t
han Niede
r
p
r
etty: in
i
tiali
z
e
new cmt
_
fmt
_
map
t
o 0
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-08
Jonatha
n
N
ieder
adapt request-pull tests for new pull reque
s
t format
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-06
Jon
a
than Nieder
test-lib: some shells do not let $?
propa
g
ate into
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jonatha
n
Nieder
s
h
ortlog: Do
c
ument and test --format opti
o
n
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jonathan N
i
eder
t42
0
1 (
s
hortlog): Test output format
w
i
t
h m
u
ltiple
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jonat
h
a
n
Nieder
t42
0
1
(
shortlog):
g
u
ard s
e
tup wi
t
h
t
e
st_expect_success
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jonat
h
an Nieder
Documentation/shortlog: scripted users should
n
ot rely
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jona
t
h
an Nie
d
er
comm
i
t
-
-amend: c
o
pe with missing dis
p
lay name
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jo
n
athan Nieder
test-l
i
b:
Let t
e
s
t
s
specify commands
t
o be
r
un
a
t end
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-01
Jonathan Nieder
fsck:
che
c
k ident
lines
i
n
commit objects
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-01
Jonat
h
a
n
Nieder
r
e
quest-pull: prot
e
ct against
OPTIONS
_
K
EEPDASHDASH
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-01
Jonathan Nie
d
er
tests for request-pu
l
l
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-22
J
o
n
at
h
an Nied
e
r
Docu
m
entati
o
n
/
M
ak
e
f
i
le:
f
ix in
t
errupted builds of user
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-20
Jonathan
N
ieder
fix "
b
u
n
d
le --st
d
i
n"
s
egf
a
ult
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-20
Jonathan
Nieder
t570
4
(bundle)
:
ad
d
t
es
t
s f
o
r b
u
n
d
l
e -
-
stdin
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-17
Jonathan
Nieder
t
ag -v: us
e
RUN_GIT
_
CMD to run verify-ta
g
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-15
Jonathan Niede
r
Document n
e
w "already
-
merged" rule for branch -d
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-15
Jonathan Nieder
Add
.
dep
e
nd directories to
.
gitignor
e
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-15
Jonathan Nieder
t7006: guard
cl
e
anu
p
with
test_expect_su
c
cess
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-13
Jonathan Nie
d
er
t
5800:
testg
i
t helper requires
P
ython support
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-11
Jon
a
than Nieder
t
7
400: clar
i
fy submodule update test
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-11
Jonat
h
an Niede
r
t7400: c
l
arify
'
s
ubmod
u
le add' tests
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-11
Jon
a
than
N
ieder
t7400: split s
e
t
u
p into mul
t
iple tests
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-04
Jonathan Nie
d
er
Teach m
a
i
linfo %< as an
al
t
ernative s
c
iss
o
rs mark
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-03
Jonath
a
n Nieder
Makefile: future
-
proof Cygwin v
e
rs
i
on ch
e
ck
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan
Nieder
merge-r
e
cursive: add a
labe
l
for ancesto
r
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
J
ona
t
han Nieder
cherry-pick,
revert: add a label for
a
ncestor
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
J
o
natha
n
Nieder
revert: clarify lab
e
l on
c
onf
l
ict h
u
nks
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonatha
n
N
ieder
c
ompat:
add mempcpy(
)
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
checkout -m --conflic
t
=
diff3
:
add
a
lab
e
l
for a
n
cestor
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jo
n
at
h
an N
i
eder
merge_trees():
a
dd ancesto
r
l
abel parameter for
diff3
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan
N
ie
d
er
merge_file(): add comm
e
nt explaining behavior wrt conflict
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@mgila.com>
commit
|
commitdiff
|
tree
2010-03-21
Jon
a
than Nieder
check
o
u
t --conflict=d
i
ff3: add a
label for ancestor
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
J
o
na
t
han Nied
e
r
ll_merge(): add ancestor label paramete
r
fo
r
diff3
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonat
h
an Nie
d
er
merge-file --diff3: add a la
b
el f
o
r
a
ncestor
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
J
o
nathan Nieder
xd
l
_merg
e
(): move file1 and file
2
labels
to
x
mp
a
ram
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jona
t
han Nieder
xdl_
m
erge(): add optional a
n
cestor label to di
f
f3
-
style
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
J
on
a
than Ni
e
der
tests:
d
ocument c
h
erry-pick
b
ehavior in fac
e
of conflicts
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonatha
n
Ni
e
der
tests: document format of
c
onfl
i
cts f
r
om chec
k
out -m
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jona
t
han Nieder
r
e
vert:
f
i
x
tiny memory
l
eak i
n
cherry-p
i
c
k
--f
f
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-20
J
onathan Nieder
Makefi
l
e: Fix occa
s
i
o
na
l
GIT-CFLAGS break
a
ge
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-20
Jonathan Nieder
M
akefile: Fix CDPATH p
r
oblem
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-20
Jonathan Nie
d
e
r
git
k
:
D
o
n't clobber "Remember
t
his vie
w
" setting
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-20
J
on
a
than
N
ieder
gitk: Ad
d
co
m
me
n
ts to
e
x
plain
e
n
c
ode_v
i
ew_opts an
d
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-02-28
Jonathan N
i
eder
Makef
i
l
e: clarify definition of
TEST_OBJS
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-02-23
Jo
n
athan Niede
r
am: remove
rebase-appl
y
d
irectory befo
r
e gc
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-02-22
Jonathan Nieder
tests:
F
ix race con
d
ition in t7006
-
pager
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-02-21
Jonathan Nieder
t700
6
-pager: if
s
t
d
o
u
t is not a terminal, mak
e
a new one
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-02-20
Jonatha
n
N
i
eder
tes
t
s: A
d
d
tests for auto
m
atic
us
e
of pa
g
er
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-02-15
Jonath
a
n Nieder
am:
F
ix la
u
n
ching of pag
e
r
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-02-15
Jo
n
a
t
han Nieder
git sv
n
: Fix launchi
n
g
of pager
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-02-15
Jonathan Nieder
git
.
1: Clar
i
fy the behavio
r
of the --paginate option
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-02-15
Jonathan N
i
eder
Make
'g
i
t var GIT_P
A
G
ER' always print
the
config
u
red
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-02-15
Jonathan Nieder
Fix
'
gi
t
v
a
r' usage synopsi
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-31
Jonathan Nieder
Ma
k
e
file: always remove
.
de
p
en
d
directo
r
ies o
n
'make
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-31
Jonathan
N
ieder
Make
f
il
e
:
tuck
a
way
generated m
a
ke
f
ile fr
a
gm
e
nts in
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-31
J
o
natha
n
Nieder
D
o
not install shell libr
a
ries executable
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-27
Jonath
a
n Nieder
Teach Mak
e
fi
l
e to
c
heck header dependencies
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-27
Jonathan N
i
eder
M
akefile:
l
ist
s
tandalone
program object
f
iles in PR
O
GR
A
M
_
O
B
J
S
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-26
Jonatha
n
Nie
d
er
Makefile: lazily compute header d
e
p
e
nden
c
ies
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-26
Jonathan Nieder
M
a
kefi
l
e:
list ge
n
e
r
ated o
b
ject f
i
les in OBJECTS
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-26
Jonathan Nieder
Ma
k
e
f
ile: dis
a
ble de
f
ault
i
mplicit rules
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-26
Jo
n
ath
a
n
Niede
r
M
akefile: rea
r
range
dependency
r
ules
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-26
Jonathan Nieder
Makefile: transpor
t
.
o depends
o
n branc
h
.
h
no
w
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-26
Jonathan
Nied
e
r
M
e
rge branch
'mast
e
r' of
g
it://repo
.
or
.
cz/
a
lt-git into
.
.
.
commit
|
commitdiff
|
tree
2010-01-26
Jonat
h
an Ni
e
der
Makefile:
drop dependency on
$(w
i
ldcard
*/*
.
h
)
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-26
Jona
t
han Nied
e
r
Makefile: clean up h
t
tp-w
a
lker
.
o dependency rules
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-26
Jon
a
tha
n
Niede
r
Makefile: r
e
move wt-status
.
h fro
m
LIB
_
H
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-26
Jonathan Nieder
Makefi
l
e: mak
e
su
r
e test helpers are re
b
uilt when hea
d
ers
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-26
Jonathan Nieder
M
akefile:
a
dd missing h
e
ader file depe
n
dencies
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-24
J
onathan Nieder
Do
c
umentation: merge: use MERGE_HEAD to refer
t
o
the
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-24
J
onathan Nieder
Documentation: simpl
i
fy How
M
erge Works
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-24
Jona
t
han N
i
e
d
er
D
o
cumentation: merge: add a s
e
ct
i
on
a
b
o
ut fast-forward
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-24
Jon
a
than Nie
d
er
Documentation:
emp
h
a
s
i
z
e when
git merg
e
termina
t
es
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
next