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
t/t9001-send-email.sh: fix stderr redirection in 'Invalid In-Reply-To'
2010-10-14
Jona
t
h
an Nieder
Documen
t
ation
:
update implic
i
t "--no-ind
e
x
" behavior
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-10-14
Jonathan N
i
eder
D
ocumentation
:
expand 'git diff' SEE ALSO s
e
ction
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-10-14
J
onatha
n
Nieder
Docum
e
nta
t
ion: diff ca
n
co
m
pare blobs
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-10-14
Jo
n
athan Nieder
Doc
u
mentation
:
gitrevisions is in sect
i
on 7
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-10-08
J
o
n
athan
N
ieder
Docu
m
entation:
N
o
argumen
t
of A
L
LOC_GROW sho
u
l
d hav
e
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
J
o
natha
n
Nieder
xdiff: cast
a
r
g
uments for ctype funct
i
ons to unsigne
d
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Jonathan N
i
eder
ini
t
: plug tiny on
e
-tim
e
m
emo
r
y
l
eak
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-10-03
Jonat
h
an Niede
r
setup
:
make sure
git d
i
r p
a
th is in
a
perm
a
ne
n
t buffer
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-10-03
Jonathan Nie
d
er
environment
.
c: remove unused variab
l
e
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Jo
n
athan
N
ieder
t0004 (u
n
writabl
e
files): s
i
mplify error handli
n
g
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-09-09
Jonathan Ni
e
d
e
r
t2016
(
ch
e
ck
o
u
t
-p): add missing
&&
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-09-09
Jonathan
N
i
e
der
t1
3
02 (core
.
repo
s
itoryv
e
rsion
)
:
style tweaks
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-09-09
Jonatha
n
Nie
d
er
t2
1
05 (gitfile): a
d
d
missing &&
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-09-09
Jonat
h
an Nieder
t1450
(fsck): remove dang
l
ing objects
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-09-09
J
o
nath
a
n Nieder
tes
t
s:
s
ubshell indentation stylefix
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-31
Jonatha
n
Ni
e
der
te
s
ts:
s
impl
i
fy "mis
s
ing PREREQ" message
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-31
Jonatha
n
Nieder
tes
t
s: ma
k
e test
_
m
i
ght
_
fail fail on
m
i
s
sing commands
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-31
Jona
t
han
Nieder
tes
t
s
:
make t
e
s
t_migh
t
_
fail more v
e
rbose
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-24
Jonathan Nieder
pa
r
se-options: clarif
y
PARSE_OPT_NOARG descripti
o
n
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-24
Jonath
a
n Niede
r
t3302 (notes): Por
t
to Solaris
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-24
Jon
a
than Nieder
do n
o
t pass "git -c
f
oo=bar" params to trans
p
o
r
t hel
p
ers
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-22
J
o
nathan Nieder
ap
p
ly: h
a
ndle tr
a
ditional pat
c
hes with space in filenam
e
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-22
J
o
nathan Nieder
tests: exe
r
cise "git a
p
ply" with
w
eird filenames
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-22
Jonatha
n
Nieder
apply: s
p
lit quot
e
d fil
e
name handling into new
funct
i
o
n
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-20
Jona
t
han Nieder
Documenta
t
ion: remove stray backslash in s
h
ow-bran
c
h
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-20
Jonathan Niede
r
Docu
m
entation: remov
e
stray backslashes from "Fighti
n
g
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-20
J
onathan
N
i
e
der
Documentation: do
not
c
onvert
.
.
.
operator t
o
ell
i
pses
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-20
Jo
n
athan
N
ieder
Docum
e
ntation:
avoid stray backsl
a
sh
in user m
a
n
ual
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-20
Jonathan Nieder
Documentation
:
avoi
d
stray backslashes in co
r
e tuto
r
ial
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-20
J
o
nathan Ni
e
d
er
D
o
cumentation: remove
s
tray
backslashes
i
n rev-pa
r
se
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-20
Jonathan N
i
ed
e
r
Docu
m
entation: rem
o
ve bac
k
slash befo
r
e ~ in fast-
i
mpor
t
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-20
Jonathan Nieder
Docume
n
tation: remov
e
stray bac
k
slash from "git bu
n
dle
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-20
J
o
n
athan Nie
d
er
D
ocument
a
ti
o
n/te
c
hnical: avoi
d
stra
y
ba
c
k
s
las
h
in parse
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-20
Jonat
h
an Nieder
Documentation:
r
emov
e
b
acks
l
ashes in
m
anpage synopses
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-20
Jonathan Nieder
D
o
cumenta
t
i
on: clarif
y
qu
o
ting in git
i
gnore do
c
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-20
Jonathan
N
ied
e
r
Documentation: clarify quoting in "git rm" exampl
e
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-20
Jona
t
han Nieder
Documentati
o
n: add m
i
ssing quotes to "git grep" examples
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-20
J
onathan Nieder
Documen
t
ation: cl
a
rify quot
i
ng
i
n "
g
i
t
add" exampl
e
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-20
Jonathan Nieder
Documentati
o
n: unbreak re
g
ex in show-ref manual
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-20
Jonatha
n
N
i
ede
r
D
ocumentation: quo
t
ing troubl
e
in
"
git rm" discussion
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-20
Jonathan Nieder
Documentat
i
o
n
: tw
e
a
k descr
i
ption of log
.
date
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-20
Jonathan Ni
e
der
D
o
cumenta
t
ion: set a !DOCTY
P
E for user ma
n
ual
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-19
Jonathan Nied
e
r
a
u
t
o
conf: don't use platform
r
ege
x
if it
la
c
ks R
E
G_STARTEND
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
m
erge script: l
e
arn --[no-]r
e
rere-autoupdate
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jon
a
t
han Nie
d
e
r
merg
e
script: notice @{
-
1} s
h
orthand
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan N
i
ede
r
merge s
c
ript: ha
n
d
l
e --no-ff --no
-
com
m
it correctl
y
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
merge scri
p
t
:
-
-
ff-only to disal
l
ow true merge
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
m
e
rge script: handle many-wa
y
o
ctopus
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonat
h
an Nieder
m
erge scri
p
t: handle
-m --log correctly
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
m
erge script
:
fo
r
bid merge -s index
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
J
o
nathan Nied
e
r
merg
e
script
:
allow custom
st
r
at
e
gies
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
J
onathan
N
ieder
merge script: mer
g
e -X<option>
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jo
n
athan N
i
ed
e
r
merge s
c
ript
:
imp
r
ov
e
log message s
u
bject
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
m
erge script
:
r
e
fuse to merge d
u
ring merge
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonath
a
n Nieder
merge script: tweak
unm
e
rged files
m
essage to m
a
tch
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
J
o
nathan Nieder
merge script: --
s
quash, --ff from
unborn branch are
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jona
t
han Nieder
fmt-merge-msg -m to override
m
er
g
e title
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
merge-ba
s
e
-
-ind
e
pe
n
dent to print reduced parent
l
ist
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jona
t
han Nieder
merge-b
a
se --octopus to mi
m
ic show-branch --merg
e
-base
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jon
a
than Nieder
Docume
n
ta
t
ion: add a SEE
ALSO section for merge-base
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jon
a
than Nieder
t
6
200 (fmt
-
mer
g
e-ms
g
): style nitpicks
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonat
h
an Nieder
t6010 (merge-ba
s
e):
m
odernize
s
t
y
l
e
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
J
onatha
n
Nieder
t7600
(
m
e
rge):
t
est merge from
branch yet to be born
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
J
o
nathan Nieder
t7600 (merge): ch
e
ck reflo
g
entr
y
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jo
n
a
t
h
an
N
ied
e
r
t7600 (merge
)
:
d
o
n
ot l
a
unch gitk for
-
-deb
u
g
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
t7600 (merge
)
:
mode
r
n
i
ze st
y
le
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
merg
e
: do not
mist
a
ke
(
ancestor o
f
)
t
ag for branch
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-16
Jonath
a
n Nieder
t7006 (page
r
)
: add
missing TTY pre
r
equis
i
tes
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-16
J
onathan Nieder
merge
:
let custom strategies i
n
tervene i
n
trivi
a
l merges
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-16
Jonathan Nied
e
r
t7606
(
merge-
t
heirs): mode
r
n
i
ze style
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-16
Jonathan Ni
e
der
cherry-pick/r
e
vert:
U
se advise
(
) for hi
n
ts
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-16
Jonathan Nieder
cherry-pick/revert: Us
e
e
rror() for failure message
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-16
Jonathan Nieder
I
n
troduce advise() to
p
rint h
i
n
t
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-16
Jonatha
n
Nieder
Elimin
a
te “Finished cherry-pic
k
/revert” message
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-15
Jonathan N
i
eder
t9010 (svn-f
e
):
avoid symlinks in
test
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-15
Jona
t
han Nie
d
er
t9010
(svn-fe
)
: u
s
e Unix
-
s
tyle
path in URI
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-15
Jonath
a
n Nieder
v
c
s-sv
n
: Avoid
%
z in fo
r
mat string
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-15
Jonathan Nieder
vcs-sv
n
: Ren
a
me diren
t
p
ool
to build on Win
d
o
w
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-15
Jonath
a
n Nieder
compat: add strtok_r()
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-15
Jon
a
than Nieder
treap: style fix
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-15
Jonathan Nieder
vc
s
-svn: r
e
move
b
uild
art
i
facts on "ma
k
e clean"
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-15
J
onathan Niede
r
svn-fe man
u
al:
Clarify warning about
deltas in d
u
mp
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-15
Jo
n
athan Nieder
Update svn-fe manual
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-15
Jonathan Nieder
Intr
o
d
uce vcs-
s
vn lib
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-12
Jonathan
N
ieder
Standardiz
e
do {
.
.
.
}
w
hile (0) sty
l
e
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-11
Jonathan Nieder
write-tree: Avo
i
d leak
w
hen index refer
s
to a
n
inv
a
l
id
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-11
Jonathan Nie
d
er
read-tree: s
t
o
p
l
eakin
g
tre
e
objects
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-11
Jona
t
han Nieder
cor
e
: Stop leaking on
d
isk_cache_entrys
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-09
Jonathan Nieder
gitweb: clarify s
e
arch
r
esults
p
age when no
matching
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-09
Jonathan Nieder
Docum
e
n
t
ati
o
n: a
d
d a FILES section
for
show-ref
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-09
Jonathan Nieder
M
a
kefile: add mis
s
ing dependen
c
y on http
.
h
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-09
Jonathan Nied
e
r
Make
f
i
l
e: a
d
d
m
issing dependencies
o
n
url
.
h
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-06
Jo
n
at
h
an Nied
e
r
Allow "check-ref-format --branch" from
subd
i
rectory
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan Nied
e
r
c
heck-ref-format
:
handle subc
o
mmands in
s
ep
a
ra
t
e
functions
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan Nieder
merge-r
e
cursive
-
-renormal
i
ze
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan Nieder
rerere: ne
v
er renormalize
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-06
Jo
n
ath
a
n Nie
d
e
r
r
e
rere
:
migrate to
p
ars
e
-optio
n
s A
P
I
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-06
Jonatha
n
Nieder
t420
0
(
rere
r
e):
m
o
d
ernize
style
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-06
Jon
a
than Nieder
ll-merg
e
: let caller decide wh
e
t
h
e
r
to
re
n
ormalize
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan Nie
d
er
ll-merge: make
f
l
ag eas
i
e
r
t
o populate
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
next