repo.or.cz
/
git
/
platforms.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Documentation/technical: avoid stray backslash in parse-options API docs
2010-08-20
Jonathan Nied
e
r
Documen
t
ation/technical: avoid
s
tray backs
l
ash i
n
parse
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-20
Jonathan
Nieder
Document
a
tion: remove backslashes in man
p
age synopses
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-20
Jonathan
N
ied
e
r
Documentati
o
n: clarify
q
uoti
n
g in gi
t
ignore
d
ocs
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-20
Jonathan Nieder
Documentation: clar
i
f
y
quoting
in
"git rm" exam
p
le
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-20
Jonathan Nieder
D
o
cumenta
t
i
o
n:
a
dd
m
issing quote
s
to "git grep" examples
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-20
Jo
n
athan Nieder
Do
c
umentation: clarify quoting in
"g
i
t ad
d
" exa
m
ple
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-20
Jonatha
n
Nieder
D
o
cumentatio
n
: unb
r
eak regex in show-
r
ef ma
n
ua
l
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-20
J
o
nathan
N
ieder
Docume
n
tat
i
on: quoting trouble in "git rm" discussion
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-20
Jonathan Nie
d
er
Documentation
:
tweak de
s
cri
p
tion of
l
og
.
date
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-12
J
onathan Nied
e
r
Stand
a
rdize
do {
.
.
.
} while (0) style
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-11
J
o
nathan Nieder
write-tree:
Avoid lea
k
when index refers
t
o an inva
l
i
d
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-11
Jon
a
th
a
n Nieder
r
ead
-
tree:
s
top l
e
aking tr
e
e objects
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-11
J
o
nathan N
i
ed
e
r
core:
Stop
l
eaki
n
g ondisk_cache_entrys
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-09
Jonath
a
n Nieder
g
it
w
eb: clarify search results page
w
h
e
n no m
a
tch
i
ng
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-09
Jo
n
a
t
han Nieder
Documen
t
ation
:
add
a
FILES sect
i
on fo
r
show
-
ref
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-09
Jona
t
han N
i
eder
Makefile: add missing dep
e
nd
e
ncy on
h
ttp
.
h
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-09
Jonathan Nieder
Makefile: add missing depen
d
e
n
cies on url
.
h
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan Nieder
A
llow "chec
k
-ref-forma
t
--b
r
anch"
f
ro
m
subdirectory
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan Nieder
check
-
ref-format:
h
andle subcommands
i
n
sep
a
r
ate functions
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-02
Jo
n
athan
Nie
d
er
D
o
cum
e
n
ta
t
ion:
flesh
o
ut “gi
t
pull” descripti
o
n
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-02
Jonathan Nieder
gitweb:
allow configurations that ch
a
nge with each
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-27
Jonathan Niede
r
ex
a
mples/commit: use --abbrev for comm
i
t
s
um
m
ary
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-27
Jo
n
athan N
i
ed
e
r
che
c
kout, com
m
it: remov
e
c
on
f
using assignments t
o
re
v
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-27
Jon
a
t
h
an Niede
r
archive: abbrevia
t
e substitute
d
commit
i
ds again
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-27
Jonathan N
i
e
der
c
onfig --get
--path: c
h
eck for u
n
s
e
t
$HOME
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-23
Jon
a
than Nieder
t3400 (rebase)
:
whitespace cl
e
an
u
p
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-23
J
o
nat
h
an Nieder
t4150 (am): futureproof against failing tests
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-23
J
onathan Nieder
t4150
(
a
m): style fix
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-21
J
o
nathan Nieder
t
/README: cor
r
ect an
exception when bre
a
k
i
ng a &&
chain
.
.
.
commit
|
commitdiff
|
tree
2010-07-16
Jona
t
han Nied
e
r
Add
a
sample user f
o
r the svndump li
b
r
a
ry
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-15
J
o
nat
h
a
n N
i
eder
Export
parse_date_basic() to con
v
er
t
a
date string
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-15
Jona
t
han Nieder
Docum
e
ntation: add
s
ubmodul
e
.
*
t
o the big config
u
rat
i
on
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-15
Jonath
a
n Ni
e
der
gitm
o
d
u
l
e
s
.
5
: url can
b
e a
r
elative p
a
t
h
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-14
Jonathan N
i
e
d
e
r
git --paginat
e
: paginate external
c
omman
d
s again
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-12
Jonath
a
n Nieder
t30
0
0 (ls-f
i
les -o): m
o
dernize styl
e
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-08
Jonathan Nieder
t9118 (git-svn): preve
n
t early failure from taking
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-07
Jo
n
athan Nieder
t/READM
E
: document more test helpers
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-05
Jonathan N
i
ede
r
Teach fas
t
-
i
mport t
o
import
subtre
e
s n
a
m
e
d by tree id
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-29
Jonathan Nieder
revert: do not rebuild
ar
g
v
on heap
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-28
Jo
n
athan Ni
e
d
e
r
t
ests:
l
oc
a
l config file
should be honored
f
rom subdi
r
s
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-28
Jonathan Nie
d
er
t7006: test pager
c
on
f
ig
u
r
a
tio
n
f
o
r severa
l
git
comm
a
nds
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-28
Jonathan Ni
e
der
t7
0
06
(pager): i
n
t
roduce helper for pa
r
ameter
i
zed tests
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-14
Jonat
h
an Ni
e
der
t3508 (
c
herry-pick):
futureproof a
g
a
i
n
s
t un
m
erged file
s
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-14
Jonathan Nieder
git-svn: st
r
ip
off leading slashes o
n
--trunk argument
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-13
Jonathan Nieder
ad
d
-intera
c
tive: Clarif
y
“remaining
hunks
i
n the file”
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-13
J
o
n
a
than N
i
ed
e
r
grep:
refac
t
or g
r
ep_objects loop into it
s
own f
u
nction
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-11
Jonathan Nieder
Docum
e
ntation/checkou
t
: clar
i
fy
d
es
c
ri
p
tion
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-11
J
onathan Nieder
rebase -i -p:
d
o
c
u
me
n
t short
c
o
mings
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-02
J
onathan Niede
r
D
W
IM 'gi
t
show -5' to 'git
show --do-w
a
lk
-5'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-01
J
o
nathan Nie
d
er
gitignore
.
5
:
C
larify matching rules
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-01
Jonat
h
an
N
ieder
rebase:
improve err
o
r
m
e
s
s
age when
upstre
a
m
a
r
gument
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-01
Jonathan Nieder
Docume
n
ta
t
ion
/
c
hec
k
ou
t
: cl
a
rify de
s
criptio
n
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-28
Jonatha
n
Nieder
f
sck:
fix
b
ogu
s
co
m
m
it he
a
der che
c
k
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-20
Jonath
a
n Nieder
Add git re
m
ote
s
et-branches
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-20
J
o
nathan Nieder
p
o
st-receive-email: do
c
um
e
nt comman
d
-line mode
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
Jo
n
athan Nieder
g
it
s
vn
:
avo
i
d
uninitialized var in 'reset'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
Jon
a
than Niede
r
Make
f
ile: let header dependency checker override C
O
MP
U
TE_HEA
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
J
o
nat
h
a
n
Niede
r
M
akefile
:
f
i
x
h
ea
d
er dep
e
ndenc
y
checker to allow NO_C
U
RL
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Nieder
Docu
m
e
n
tation/n
o
tes: nitpicks
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Niede
r
Documentation/not
e
s:
clean up descripti
o
n o
f
rewriting
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan
Nieder
D
o
cumen
t
ation/notes
:
si
m
plify treatment of
d
efault
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan N
i
e
der
Doc
u
m
e
n
tation/l
o
g: add a CONFIGURATION secti
o
n
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
J
onat
h
an
Nieder
Documentation
/
notes: simplify treatment of default
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
Jonatha
n
Nieder
Docum
e
ntatio
n
/notes:
add configuration
s
ection
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan
N
ied
e
r
Docum
e
ntation
/
notes: descri
b
e content
o
f
n
ote
s
bl
o
bs
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
Jonat
h
an Nieder
Docu
m
ent
a
t
ion/notes: docume
n
t format of notes trees
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-08
Jonat
h
an Nied
e
r
cherry-p
i
ck: do not dump core when iconv fai
l
s
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-08
Jon
a
than Nied
e
r
p
re
t
ty:
in
i
tialize n
e
w
cmt_fmt_map t
o
0
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-08
J
onathan Nieder
adapt
r
equ
e
st-pull t
e
sts f
o
r new p
u
ll request forma
t
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-06
Jo
n
athan Nieder
test-lib: some shells do
not l
e
t $? p
r
op
a
gate into
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-04
Jonathan Nieder
shortl
o
g:
Document
and
test --
f
ormat o
p
ti
o
n
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-04
Jonathan Ni
e
der
t4201 (shortlog):
T
est
output format
with
mult
i
pl
e
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-04
J
o
n
athan Nieder
t4201 (shortlog): guard setup with test_expect_su
c
cess
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-04
Jona
t
han Nie
d
er
Documentation
/
sh
o
rtlo
g
:
s
cr
i
pted users should not r
e
ly
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-04
Jona
t
h
a
n Nieder
commi
t
--a
m
end: cope with m
i
ssing display
name
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-04
Jo
n
athan Nieder
te
s
t
-lib: Let tests sp
e
cify commands to be run a
t
end
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-01
Jonat
h
an Nieder
fsc
k
: check ident lines in commit objects
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-01
Jonathan Ni
e
der
request-pull:
p
rote
c
t
against O
P
TIONS_KEE
P
DASHDASH
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-01
Jonath
a
n Niede
r
tes
t
s for re
q
uest-pu
l
l
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-22
J
o
nathan Niede
r
Doc
u
mentati
o
n/
M
ak
e
file: fix interru
p
ted builds of user
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-20
Jon
a
than
N
ieder
fix
"bundle
--st
d
i
n"
s
egfault
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-20
Jo
n
a
t
han N
i
eder
t5704 (bundl
e
): add tests f
o
r bundle
--stdin
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-17
Jonathan
Nieder
tag -v: use RUN_GIT_CMD to run verify-
t
ag
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-15
Jonathan N
i
e
de
r
Docum
e
nt new
"alre
a
dy-
m
e
r
ged
"
rule for branch -
d
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-15
Jonathan Nieder
Ad
d
.
de
p
end
d
irectories to
.
gitignore
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-15
Jonat
h
an Nieder
t
7
006: gu
a
rd c
l
eanup wit
h
test_expect_succ
e
ss
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-13
Jo
n
athan
Nieder
t
5
80
0
: tes
t
g
it hel
p
er requires Python suppor
t
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-11
J
o
nathan
Ni
e
der
t7400:
c
larif
y
sub
m
odule update tests
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-11
Jonathan N
i
eder
t7400: clarify 'submodule add' te
s
t
s
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-11
Jon
a
t
h
an Nieder
t
7
4
00: split setu
p
in
t
o mul
t
i
ple tests
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-04
J
ona
t
han Nieder
Teach
mailinfo %<
a
s
a
n alter
n
a
t
iv
e
scissors
m
ar
k
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-03
Jonathan Nieder
Makefile: futur
e
-p
r
oof Cygwin
ve
r
sion check
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
J
onathan
Ni
e
der
merge-
r
ecursive:
add a label
f
o
r
ancesto
r
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
J
o
n
a
than Nieder
c
herry
-
pick, re
v
ert:
a
dd a label f
o
r an
c
estor
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonatha
n
Nieder
rever
t
:
c
larify
lab
e
l on conflict h
u
nks
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Ni
e
der
com
p
a
t: add mempcpy()
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jon
a
than
Nieder
checko
u
t -m
--conflict=diff3: add a
label for a
n
cestor
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonat
h
an
N
ieder
mer
g
e_trees(): add ances
t
or
label p
a
rameter for dif
f
3
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
merge_file()
:
add
comment e
x
pla
i
nin
g
b
e
havior w
r
t conflict
.
.
.
commit
|
commitdiff
|
tree
2010-03-21
J
onathan Nieder
checkout --conflict=di
f
f3: a
d
d a
l
abe
l
f
o
r
ancestor
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
next