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
t7601 (merge-pull-config): add missing &&
2010-10-06
Jonath
a
n Nie
d
er
x
diff:
cas
t
arguments for ctype functi
o
n
s
to
u
n
s
i
gned
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Jonathan
N
ieder
init: plug tiny one
-
ti
m
e m
e
mory leak
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-10-03
Jonathan N
i
eder
setup:
m
ake sure git dir p
a
t
h
is in a
perma
n
en
t
b
u
f
fer
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-10-03
Jona
t
han Nieder
environmen
t
.
c: r
e
move unused v
a
r
iable
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
J
o
nathan Nieder
t
0
004 (u
n
writable f
i
les): simplify error handling
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-09-09
Jonathan N
i
e
d
er
t2016 (checkou
t
-p
)
: ad
d
missing &&
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-09-09
Jon
a
than Nied
e
r
t1302 (core
.
reposit
o
ryversion):
st
y
le twe
a
ks
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-09-09
Jonathan Nieder
t2105 (gitfil
e
):
add missing &&
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-09-09
J
o
na
t
han Nieder
t14
5
0 (fsck): remove dangling objects
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-09-09
Jonathan Nieder
test
s
: subshell in
d
entat
i
on stylefix
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-31
J
o
nat
h
an
Niede
r
t
ests:
simplify "missing P
R
EREQ" message
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-31
Jonathan Nieder
tests: make
t
e
st_might_fail fai
l
on missing comman
d
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-31
Jona
t
h
a
n Nieder
t
e
s
t
s: make test_mi
g
ht
_
fail mor
e
verbose
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-24
Jonathan Nied
e
r
p
a
r
se-optio
n
s:
c
l
a
rify PARSE_OPT_NOARG
description
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-24
Jonathan N
i
eder
t3302 (no
t
es): Port
to Solaris
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-24
J
onat
h
an Ni
e
der
do
n
ot pass "git -
c
foo=ba
r
" pa
r
am
s
to transport hel
p
e
r
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-22
Jonath
a
n N
i
eder
apply:
h
a
n
dle t
r
ad
i
tional patches with space in filename
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-22
Jonathan Ni
e
der
tes
t
s: exerci
s
e
"git a
p
ply" with weird filen
a
mes
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-22
Jon
a
t
h
an Nieder
a
pply:
split quoted fi
l
ename handling int
o
new
f
unc
t
ion
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-20
Jonathan Ni
e
der
Docume
n
tati
o
n: re
m
ove st
r
ay backs
l
as
h
in show-br
a
nch
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-20
Jonath
a
n
N
ieder
Documentatio
n
: remove stray backslashes from "Fighting
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-20
Jonat
h
an
Nieder
Documentation: do not convert
.
.
.
operator t
o
ellips
e
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-20
Jo
n
athan Nieder
D
ocumenta
t
i
on:
a
void stray backs
l
ash
i
n
u
s
er m
a
nual
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-20
J
onathan
N
ieder
Docum
e
ntation: avoid str
a
y
backsla
s
hes in
core tutorial
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-20
Jonathan N
i
eder
Docume
n
tation: remove
s
tray backslashes in rev-parse
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-20
Jonathan
Ni
e
der
D
ocumentation:
remove backsla
s
h
before ~ i
n
f
a
s
t-import
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-20
J
o
nathan
Nied
e
r
Documentation: remove stray backslash from "git bundle
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-20
Jon
a
than
Niede
r
D
ocumenta
t
ion/techn
i
cal: avoi
d
st
r
ay backslash in
p
arse
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-20
Jonathan Nieder
Docu
m
ent
a
tion:
r
emove backslas
h
e
s
in
manpage syno
p
ses
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-20
Jonathan Nieder
D
ocumentation
:
clarify quoting in gitignore do
c
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-20
J
onathan Nieder
Documentation: c
l
arify q
u
oting in
"
gi
t
rm" example
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-20
Jona
t
han N
i
eder
Docume
n
tatio
n
: add miss
i
ng q
u
otes to "g
i
t grep" example
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-20
Jo
n
at
h
an Nieder
Doc
u
m
e
ntati
o
n: clari
f
y q
u
otin
g
in
"gi
t
add" exampl
e
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-20
J
o
nathan Nie
d
er
Docu
m
entation: unbrea
k
reg
e
x
in s
h
ow-ref manual
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-20
Jonathan Nie
d
er
Document
a
tion: quotin
g
troubl
e
in "
g
i
t
rm" discussion
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-20
Jonathan Nieder
Docume
n
ta
t
ion: tweak description o
f
l
o
g
.
date
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-20
Jon
a
tha
n
Ni
e
der
Documentati
o
n: set a !DOCTYP
E
for user manual
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-19
Jon
a
t
h
an
Ni
e
der
autoconf:
don't u
s
e platform reg
e
x
i
f it lacks
R
EG_ST
A
RTEND
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
J
o
nathan Nieder
merge script: learn --[no-]rerere-aut
o
update
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan N
i
eder
m
erge scri
p
t
:
n
o
tice @{-1}
shor
t
hand
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jo
n
athan Nieder
merge
s
cr
i
pt: handle --no-ff --no-c
o
m
m
it correctly
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
merge script: --ff
-
onl
y
to d
i
sal
l
ow
tru
e
merge
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
merg
e
script: handle many-way octopus
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonatha
n
N
i
eder
m
erge sc
r
i
pt: handle -
m
--log correctly
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonat
h
an
N
ieder
merge script
:
f
o
rbid mer
g
e
-s index
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jo
n
a
than Nieder
merge scrip
t
: allow custom strategies
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonat
h
an Niede
r
merge scr
i
pt: merge -X<option>
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
J
o
nathan Ni
e
der
m
e
rge script: improve log mes
s
age subject
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonat
h
a
n Ni
e
der
merge
script: refuse to merge during merg
e
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jo
n
a
than Nied
e
r
merg
e
script: twe
a
k unmerged files message t
o
matc
h
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jona
t
han Nieder
merge scr
i
pt: --squ
a
sh,
--ff from unborn
b
ranch are
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
fmt-merge-msg -m t
o
override merge ti
t
l
e
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonath
a
n Nieder
me
r
ge-
b
ase --independent to
pri
n
t reduced parent
l
is
t
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jo
n
athan Nieder
merge-bas
e
--oc
t
opus to mimi
c
sh
o
w-branch
--me
r
ge
-
base
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jon
a
than Nieder
Documentation: add a SEE ALSO secti
o
n f
o
r
me
r
ge-b
a
s
e
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
t6200 (fmt-merge-msg): style nit
p
ic
k
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonatha
n
Nieder
t6010
(
m
erge-base): modernize styl
e
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonath
a
n Nieder
t7600 (merge):
t
est merge fro
m
branch
y
e
t to be bo
r
n
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
J
onat
h
an Nieder
t
7
6
00 (merge): check
r
eflog entry
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
J
o
nathan Nieder
t
7600 (merge):
do not launch gitk for --debug
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jon
a
t
han Nieder
t7600 (me
r
ge): moderni
z
e style
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
merg
e
: do no
t
m
i
s
t
ake (ancest
o
r of) tag for
branch
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-16
Jonathan Ni
e
d
er
t7006 (page
r
): add missin
g
TTY prerequisites
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-16
Jonathan Nieder
merge: let custom s
t
rat
e
gies inter
v
ene i
n
t
r
ivial
me
r
ges
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-16
Jonathan Nieder
t76
0
6 (me
r
ge-theirs):
moder
n
ize style
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-16
Jon
a
than Nieder
c
herry-pick/revert: Use adv
i
se() for hints
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-16
Jonathan
Nie
d
er
c
her
r
y-p
i
ck
/
rever
t
: Use error() for f
a
il
u
r
e
message
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-16
J
on
a
than Nieder
I
n
troduce
advis
e
() to pri
n
t
hints
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-16
Jonathan Nieder
E
lim
i
nate “Fi
n
i
s
hed
c
h
erry-pi
c
k
/
r
e
ver
t
” message
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-15
Jonathan Nieder
t9010
(
sv
n
-fe): avoi
d
symlinks in t
e
s
t
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-15
Jonathan Nied
e
r
t9010 (svn-fe): use Uni
x
-
s
tyle
p
ath in
U
RI
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-15
J
on
a
than Niede
r
vc
s
-svn: Avoid %z in for
m
a
t
string
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-15
Jona
t
ha
n
Nieder
vcs-sv
n
: R
e
name dirent pool to build
on Windows
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-15
Jonat
h
an Nieder
compat: add strt
o
k
_
r
()
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-15
J
o
nathan Nieder
treap: style fix
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-15
Jonathan Nieder
vcs-s
v
n
:
r
e
move build artifacts on "m
a
ke c
l
ean"
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-15
Jonathan Nieder
svn
-
fe m
a
nu
a
l
:
Clarify warning
a
bout delt
a
s in
d
u
m
p
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-15
Jonathan Nieder
Update
svn-fe manual
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-15
Jonathan Nieder
I
n
troduce
vcs-svn li
b
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-12
Jonathan N
i
eder
Standardize do {
.
.
.
}
w
hile (0) style
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-11
Jonathan Nieder
write-t
r
ee: Av
o
id leak when ind
e
x refers to an invalid
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-11
Jonatha
n
N
ieder
read-tree:
s
t
op leaking
t
ree o
b
jec
t
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-11
Jonath
a
n
N
i
eder
c
ore: Stop leaking ondisk_
c
ac
h
e_e
n
trys
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-09
Jo
n
atha
n
Nieder
gitwe
b
: clarify sear
c
h
resu
l
ts page
when no match
i
ng
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-09
Jonath
a
n Nie
d
er
Documentation: add a FIL
E
S s
e
ctio
n
for
sho
w
-ref
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-09
Jonathan
N
ieder
Makefile:
ad
d
missing depen
d
e
ncy on h
t
t
p
.
h
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-09
Jon
a
than Nieder
Makefile: a
d
d
m
issing dependenci
e
s on url
.
h
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-06
Jonat
h
an Nie
d
er
Allow "check-ref-format --branch" fro
m
su
b
direc
t
ory
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-06
J
onathan Nieder
check-ref-fo
r
m
a
t
:
h
a
ndl
e
subcomman
d
s
in se
p
a
rate func
t
ions
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan N
i
e
d
er
m
e
r
ge-rec
u
rsi
v
e
--ren
o
r
m
aliz
e
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-06
Jonat
h
an Nieder
r
erere: never re
n
ormalize
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-06
J
onathan
Nieder
rerere: migrate
to parse-options
A
PI
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan Ni
e
de
r
t4200 (re
r
ere): modern
i
ze style
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-06
Jona
t
han N
i
eder
ll-merge:
l
et caller decide whether to reno
r
maliz
e
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan Nieder
ll-merge: make fla
g
easi
e
r
t
o
populate
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan Nieder
Documenta
t
ion/tec
h
n
ical: document
ll_mer
g
e
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-06
Jona
t
h
a
n Nie
d
e
r
merge-trees: le
t
c
aller
d
e
cide whether to renormalize
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-06
Jonat
h
an Nieder
merge-trees: push choi
c
e to r
e
normali
z
e away from low
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-06
Jonatha
n
Ni
e
d
e
r
t6038 (m
e
r
g
e
.
renor
m
al
i
ze): che
c
k that it
c
an be
turned off
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-06
Jona
t
h
a
n Nieder
t6038 (merge
.
renormalize):
try
check
o
ut
-
m a
n
d cherry
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
next