repo.or.cz
/
git
/
mingw.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
t1510: setup case #31
2010-08-06
Jonat
h
an Nieder
t4
2
00 (rerere): mo
d
e
r
n
ize
style
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-06
Jo
n
athan N
i
eder
l
l-m
e
rge: let caller decide
w
h
e
the
r
to renormali
z
e
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan Nied
e
r
ll-merg
e
: make f
l
ag easier to populate
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-06
Jo
n
at
h
a
n
Ni
e
der
D
o
c
umentation/t
e
chnical: document
l
l_m
e
rge
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-06
Jo
n
athan Nieder
merge-tre
e
s: le
t
caller decide whether
to renorma
l
i
z
e
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan Nieder
merge
-
tr
e
es:
p
us
h
choic
e
to renormalize away from
low
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-06
Jo
n
athan
N
ieder
t603
8
(
merge
.
reno
r
m
aliz
e
): check th
a
t it can be turne
d
off
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan Ni
e
der
t
6038 (
m
erge
.
renormalize):
t
r
y checko
u
t -m and ch
e
rry
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-06
J
o
nath
a
n Nie
d
er
t
6
038 (merge
.
renormalize): style n
i
t
picks
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-06
Jo
n
athan Nie
d
er
diff: split off
a
function
f
o
r
-
-
s
tat-* option pa
r
sing
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-04
Jonathan Nieder
t
4
111 (apply): refresh index be
f
ore applying pat
c
hes
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-02
Jona
t
han Nie
d
e
r
Documentation:
fl
e
sh out “git pull” descri
p
tion
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-02
Jonathan Nieder
gitweb:
a
llow c
o
nfigurations tha
t
change
w
ith ea
c
h
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-02
Jonathan Nieder
t1011 (sparse checkout): style nitpicks
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-27
Jona
t
han Nieder
examples/commit: us
e
--abbrev
for commit
s
um
m
ary
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-27
Jonathan Nieder
c
heckout, commit: re
m
ove co
n
fusing assignments to
r
ev
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-27
Jon
a
than
N
ieder
archi
v
e: abbrevi
a
te
s
ubstituted commit i
d
s again
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-27
Jonathan Niede
r
conf
i
g --get -
-
path: che
c
k
f
o
r uns
e
t $HO
M
E
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-26
Jonathan Nieder
setup: split off get_device_or
_
die helper
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-26
J
o
na
t
h
an N
i
e
d
er
s
e
tup:
split off
a
function
to
h
andle h
i
t
t
ing cei
l
ing
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-26
Jonathan N
i
eder
setup: split off code
to hand
l
e st
u
mbling upo
n
a repository
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-26
Jonathan Nieder
setup: s
p
lit off a
func
t
io
n
to checks working dir fo
r
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-26
Jona
t
han Nieder
s
e
tup: split o
f
f $GIT_DIR
-
set case from s
e
tup_git_d
i
rectory_
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-26
Jonathan Nied
e
r
t
es
t
s: try git apply from subdir of toplevel
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-26
Jon
a
than
Nieder
t150
1
(rev-parse): clarif
y
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-23
Jon
a
than Ni
e
der
t340
0
(rebase): whitespace cleanu
p
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-23
Jonathan Nieder
t
4
1
50 (am): future
p
roof agains
t
f
ailing tests
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-23
Jonat
h
a
n
Ni
e
d
e
r
t4150 (am)
:
style fix
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-21
Jonathan Nieder
t/R
E
ADME: corr
e
c
t
a
n exception when b
r
eaking
a &&
c
h
a
in
.
.
.
commit
|
commitdiff
|
tree
2010-07-16
Jon
a
than
N
ieder
Add a sample
u
ser for the s
v
ndump lib
r
ar
y
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-15
J
ona
t
han Ni
e
der
E
x
port parse_date_b
a
sic() to con
v
e
rt
a
date string
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-15
Jonathan
Niede
r
Documentation: add s
u
bmodule
.
* to
the big configuration
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-15
Jonathan Nieder
gitmodul
e
s
.
5
: url c
a
n
b
e a rela
t
ive path
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-14
Jonath
a
n
N
ied
e
r
gi
t
--pag
i
nate: pa
g
inate exte
r
n
a
l
c
o
m
m
ands
a
g
ain
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-12
Jonatha
n
Nieder
t3000
(l
s
-files -o): modernize
s
tyle
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-08
Jona
t
han Nieder
t9118 (git
-
svn
)
: prevent early
f
a
i
l
u
r
e
from taking
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-07
Jo
n
athan
N
ieder
t
/
R
E
A
D
ME: docu
m
ent more test h
e
lpers
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-05
J
o
nathan Nieder
Teach fas
t
-imp
o
rt to impo
r
t subtrees named by tree id
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-29
Jonathan Nieder
reve
r
t
: do not reb
u
il
d
arg
v
on hea
p
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-28
Jonathan Ni
e
d
er
tests:
l
ocal c
o
nfig file should
b
e honored from subdirs
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-28
Jonathan Nieder
t7006: test pager
configurati
o
n
f
or sever
a
l
git c
o
mm
a
nds
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-28
Jona
t
ha
n
Nieder
t7006
(
pager):
i
nt
r
o
d
uce he
l
pe
r
for
p
aramet
e
r
i
zed
t
ests
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-14
Jonatha
n
N
ieder
t3508 (cherry-p
i
c
k
): futureproof a
g
ainst unme
r
ged fi
l
es
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-14
J
onathan Nieder
git-svn: st
r
ip of
f
lead
i
ng slashes on --
t
r
u
nk ar
g
u
m
ent
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-13
Jonathan
Nieder
a
dd-
i
nteractive
:
C
larify “remaining hunks in the file”
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-13
J
o
nathan Nie
d
er
grep:
r
e
factor grep
_
o
b
jects loop into its ow
n
fun
c
tion
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-11
Jonathan Nieder
Documentati
o
n/
c
heck
o
ut:
c
larify
d
es
c
r
iption
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-11
J
ona
t
han Nied
e
r
reba
s
e -i -p: docume
n
t sho
r
t
comings
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-02
J
onathan N
i
eder
D
WIM 'gi
t
sh
o
w -5' to 'git
s
how -
-
d
o-walk -5
'
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-01
Jona
t
han Nieder
gitigno
r
e
.
5: Clarify matching rules
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-01
Jonathan Nieder
rebase
:
i
m
prove er
r
or
m
essage when upstream
argum
e
nt
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-01
Jonath
a
n Nieder
Doc
u
mentation/chec
k
out: clari
f
y
de
s
c
r
i
pti
o
n
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-28
Jon
a
than N
i
eder
fs
c
k
:
f
ix bogus commit
head
e
r check
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-20
J
o
nathan Nieder
Add
git remote se
t
-branc
h
e
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-20
Jona
t
han Nieder
p
o
s
t-receive-email: docume
n
t co
m
mand-line mode
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Nieder
git svn: avoid
u
ninitializ
e
d va
r
in
'
r
ese
t
'
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Nieder
Makefil
e
:
let header
de
p
endency
checker ov
e
rride COMPU
T
E_HEA
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
J
onat
h
an Ni
e
d
e
r
M
a
k
efil
e
: fix
header
d
ependency checker to allow NO_CURL
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
J
onathan
Nieder
Documen
t
ation/notes
:
nitpicks
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Nieder
Documentation/
n
otes: clean up
description of r
e
writin
g
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Nieder
Docu
m
en
t
ation/notes: simplify treatment
of
d
efault
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonat
h
an Nieder
Documentation/log: ad
d
a
C
ONFIGU
R
A
T
ION section
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Nieder
Documen
t
atio
n
/no
t
es:
simplify
treatment
o
f default
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonat
h
an Nieder
Documentation/notes: add c
o
nfigurati
o
n sectio
n
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jona
t
han Niede
r
Documentation
/
notes: de
s
cribe conten
t
of notes blobs
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan N
i
e
d
er
Documen
t
at
i
on/note
s
: doc
u
ment format of
n
otes
t
rees
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-08
Jonathan Nieder
cherry
-
pick:
d
o not dump core when iconv
fails
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-08
Jon
a
tha
n
Nieder
pretty:
i
n
itialize
new cmt_f
m
t
_
map to
0
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-08
Jon
a
tha
n
Nieder
adapt
r
equest
-
p
u
ll
tests for
n
ew pull req
u
est
format
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-06
Jon
a
t
h
a
n
Nieder
t
es
t
-
lib: so
m
e shells do no
t
let
$
?
propag
a
te
into
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jonathan Nieder
shortl
o
g
: Document and
t
est
-
-format o
p
tion
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jonathan Nieder
t4201 (sho
r
tlog): Test
o
u
t
pu
t
f
ormat with multi
p
le
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jonatha
n
Nieder
t4201 (sho
r
t
l
o
g
)
: gua
r
d
setup
w
ith test_
e
xp
e
ct_success
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jonathan Nieder
Docu
m
entation/
s
h
ortlo
g
:
s
cr
i
pted us
e
rs shoul
d
no
t
rely
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jonathan Nieder
commi
t
--
a
mend: c
o
pe w
i
t
h
missing display name
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jonathan Nieder
test-li
b
: Let tests specify commands
to
be run
a
t end
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-01
Jonathan Nieder
f
sck: check ident
l
ines in comm
i
t objects
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-01
J
o
nathan
N
ieder
request-pull: protect against OPTIO
N
S_
K
EEP
D
ASHDASH
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-01
Jonathan Nieder
tests
for r
e
quest-pull
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-22
Jonat
h
an Nieder
Documentation
/
Ma
k
efile: f
i
x interrupted buil
d
s
of user
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-20
Jonathan Nie
d
er
fix "bundle --stdin" segfault
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-20
Jonathan Nieder
t5704 (bundle):
a
d
d
tests for bund
l
e --stdin
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-17
Jona
t
han
Nieder
ta
g
-
v: use RUN_GIT_CMD to
r
u
n
verify-tag
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-15
Jonathan Nied
e
r
D
o
c
ument new "already-
m
erged" rule for branch -d
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-15
J
onathan Nieder
Add
.
dep
e
nd directories
t
o
.
gi
t
ignore
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-15
Jon
a
than Nieder
t7006
:
g
uard
c
l
e
anu
p
w
ith test_expec
t
_success
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-13
J
onatha
n
Nie
d
er
t5800: testgit helper req
u
ire
s
Pyt
h
on support
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-11
Jonathan Nieder
t7
4
00:
clar
i
fy submodule u
p
date t
e
st
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-11
Jon
a
th
a
n Nieder
t7400
:
c
l
ar
i
fy 'submodule add' t
e
s
ts
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-11
Jonath
a
n Nie
d
er
t7400: split setu
p
into mu
l
tiple tests
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-04
Jonathan Nieder
Tea
c
h mailinfo %< as
a
n
a
l
tern
a
tive scisso
r
s ma
r
k
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-03
Jo
n
athan Nie
d
er
Makefil
e
: future-pro
o
f Cygwin v
e
r
s
i
on
c
heck
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
merge-recursive: add
a label for ancestor
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Niede
r
cherry-pick
,
revert: add a label
f
or
a
n
cestor
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jo
n
a
t
h
a
n Nieder
revert: clarify label on co
n
flict hu
n
k
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nie
d
er
compat:
a
dd m
e
mpcpy()
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
J
o
nat
h
an Nieder
checkou
t
-m --conflict=diff3: add
a
l
abel f
o
r
ancestor
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jona
t
han N
i
eder
merge_trees(): a
d
d
ancestor label p
a
r
a
meter for diff3
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
merge_file(): ad
d
c
omment explaining
b
ehavio
r
wrt conflict
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@mgila.com>
commit
|
commitdiff
|
tree
2010-03-21
J
onat
h
a
n Niede
r
ch
e
cko
u
t
-
-confli
c
t=diff3
:
a
d
d a label for an
c
e
stor
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
next