repo.or.cz
/
git
/
wpalmer.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Documentation/notes: describe content of notes blobs
2010-05-09
Jonat
h
an Nieder
D
oc
u
mentation/no
t
es: describe conte
n
t of notes blo
b
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jo
n
athan Ni
e
der
D
ocument
a
tion/notes: document format of notes trees
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-22
Jonatha
n
Nie
d
er
Documentat
i
on/Makefile: fix interrupted builds of u
s
e
r
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-17
Jon
a
than N
i
eder
tag
-v: use R
U
N_GIT_CM
D
to run v
e
rify-tag
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-15
J
onat
h
an N
i
eder
Document new
"
alread
y
-merg
e
d"
r
ule for
b
ranch -d
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-15
Jonathan Nieder
Add
.
depend director
i
es to
.
git
i
gnore
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-04
Jonathan Nieder
T
each mailin
f
o %< as
a
n
a
lternative scisso
r
s m
a
rk
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-03
Jonathan Nie
d
er
Makefil
e
: fut
u
r
e-proof Cygwin ver
s
ion check
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
J
o
nathan Niede
r
merge-recurs
i
ve:
a
dd a lab
e
l
for ance
s
tor
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Ni
e
d
e
r
cherr
y
-pick,
revert:
add a label for ancestor
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
rev
e
rt: clarify label on conflict hunk
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonat
h
an Nieder
compa
t
: add mempcpy()
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
J
onatha
n
Nieder
c
h
eckout -m
--conf
l
ic
t
=diff3: add a la
b
el f
o
r
ancest
o
r
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jon
a
t
h
a
n
N
i
eder
merge_tree
s
(
)
: add
an
c
estor label pa
r
ame
t
er for diff
3
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonatha
n
Nied
e
r
me
r
ge_fil
e
():
add comment
e
xplaining
b
ehavior wrt conflict
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@mgila.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
che
c
kout --conflict
=
diff3: add a label for an
c
e
s
tor
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jon
a
t
han Nieder
ll_merge(): add anc
e
s
t
or label parame
t
e
r
for diff3
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonath
a
n Nieder
mer
g
e
-file -
-
diff3: add a label
f
or
ancest
o
r
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jo
n
at
h
an N
i
eder
xdl_m
e
r
ge(): move file1 and file2 labels to xm
p
aram
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Niede
r
x
d
l_me
r
ge():
a
dd opt
i
onal ancestor label to diff3-style
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
tests: docum
e
nt cherry-pick b
e
h
a
vi
o
r in face
o
f con
f
licts
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Ni
e
de
r
tests: d
o
cument format of
c
o
n
f
licts from
c
hec
k
out
-m
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jona
t
han Nied
e
r
revert
:
f
i
x tin
y
mem
o
ry leak in c
h
erry-pick
--
f
f
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-20
Jonathan Nieder
Makef
i
l
e: Fix
o
c
c
asional GIT-CFLAGS breakag
e
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-20
J
o
nat
h
an Nieder
Makefile: Fix C
D
P
A
TH problem
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-20
Jo
n
athan Nieder
gitk: Do
n
't clo
b
ber "Remember this view" setting
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-20
Jona
t
han Nieder
gitk: Add com
m
ents
t
o e
x
plain encode
_
view_opts
a
nd
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-02-28
Jon
a
than Nieder
Makefile: clarify def
i
nition of TE
S
T_O
B
JS
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-02-23
Jo
n
athan Nieder
a
m
:
re
m
ove rebase-apply
d
irectory
b
efore gc
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-02-22
Jonathan Nieder
tests: Fix race
c
ondition in t70
0
6-pager
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-02-21
Jonathan Nie
d
er
t7006-pager: if
std
o
ut is not a termin
a
l,
m
ake a new
one
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-02-20
Jonathan Ni
e
der
tests: Add
t
es
t
s for automati
c
use of pager
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-02-15
Jonathan
Nieder
a
m
: Fix lau
n
ching of pager
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-02-15
J
o
n
atha
n
Nieder
g
it svn: Fix
launching of pager
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-02-15
Jonatha
n
Nieder
git
.
1:
Clarify the be
h
avior of the --paginate opti
o
n
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-02-15
Jonat
h
an
Nied
e
r
Make 'git var
G
IT_PA
G
ER'
always print the confi
g
ured
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-02-15
Jonatha
n
Nieder
Fix
'
git var
'
usage synops
i
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-31
Jo
n
athan Nieder
Ma
k
e
file: alwa
y
s rem
o
ve
.
depend d
i
rectories o
n
'make
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-31
Jo
n
athan Nieder
Make
f
ile: tuck aw
a
y
g
enerated
m
akefile
fragments in
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-31
Jonathan
N
i
e
der
Do not
install shell libra
r
ies exec
u
table
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-27
J
onat
h
an
N
i
e
de
r
Teach M
a
k
ef
i
le t
o
check head
e
r dependencies
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-27
Jonathan N
i
eder
Makefile: list
st
a
ndalone
p
rogram object
f
i
l
es in
P
RO
G
RAM_OBJS
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-26
Jonathan Nied
e
r
Ma
k
efile
:
lazily co
m
pute header
dependencies
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-26
Jonathan Nieder
Makefile: l
i
st generated object files in OBJECTS
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-26
Jonathan Niede
r
Ma
k
efile: disable default implicit rules
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-26
J
onathan Nieder
Ma
k
efil
e
:
rearrange dep
e
ndency ru
l
es
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-26
Jonathan N
i
eder
Ma
k
efile: t
r
ansport
.
o dep
e
nds on branch
.
h
n
ow
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-26
Jonathan Ni
e
der
Me
r
ge branch
'master
'
of git://repo
.
or
.
cz/alt-g
i
t int
o
.
.
.
commit
|
commitdiff
|
tree
2010-01-26
Jonathan N
i
eder
Makefile
:
d
r
o
p
depe
n
dency
on $(wildcard
*
/*
.
h)
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-26
Jonathan Nieder
Makefile: clean up
h
ttp-walk
e
r
.
o dependency rules
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-26
Jonath
a
n Nied
e
r
Makefile: remove w
t
-
status
.
h fro
m
LIB_H
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-26
Jonat
h
an Ni
e
der
Makefile: make
s
ure test helpers are rebuil
t
w
h
en
h
e
a
ders
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-26
J
onathan Nieder
M
a
ke
f
i
l
e
:
add missing he
a
der file depe
n
dencies
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-24
Jonath
a
n Nieder
Documentat
i
o
n
: mer
g
e
:
u
s
e MERGE_HEAD to refer
t
o
t
he
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-24
Jon
a
than Nied
e
r
Docume
n
tation: simplify How Mer
g
e Wor
k
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-24
Jonat
h
an
Nieder
Documentation: merge: add a secti
o
n abo
u
t f
a
s
t
-fo
r
ward
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-24
Jonathan Nieder
Documen
t
at
i
o
n
:
e
mph
a
size when git
m
erge termi
n
a
t
es
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-24
Jonathan Ni
e
d
e
r
Documentation:
m
e
r
g
e: add an overview
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-24
Jonathan Nieder
Do
c
umentation: merge: move m
e
rge st
r
ategy
l
ist
t
o end
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-24
Jonathan Nieder
Document
a
tion: sugg
e
st `r
e
s
e
t --m
e
rge` in How Merg
e
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-24
Jonathan Nie
d
er
Documentatio
n
: merg
e
:
m
o
v
e
c
on
f
igurati
o
n s
e
ction to end
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
Jon
a
than Nieder
Documentation: tiny
g
i
t
config
m
anual tweaks
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
Jonat
h
a
n N
i
eder
D
o
cumen
t
ation: git gc packs
r
e
f
s b
y
default
now
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
Jonathan Nieder
Documentation: tiny git
config manual tweaks
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
Jonat
h
an Nieder
Documentat
i
on: g
i
t gc packs refs
by
default
n
ow
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-07
Jonath
a
n Nied
e
r
g
it-gui: Makefil
e
: conso
l
idate
.
FORCE-* targets
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-06
J
onathan
Nieder
Makefile: consolidate
.
FORCE-* targ
e
ts
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-06
Jonathan N
i
e
d
er
M
a
kefile:
learn to generate lis
t
ings
for targets requiring
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-06
Jonathan Nieder
Makefile: use ta
r
get-sp
e
cific variable to
p
a
ss
flags
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-06
Jonathan
N
ieder
Makefile: regenerate
a
ssembler
listings when asked
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-06
Jonathan Nied
e
r
Makefile: make pp
c
/sha1ppc
.
o depend on GIT-CFLAGS
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-28
J
onathan
N
ieder
Makefile: d
o
not cl
e
an arm di
r
ectory
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-18
Jonathan
Nieder
Speed up
bash completion loading
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-13
Jon
a
than
N
i
eder
Provide a build time defau
l
t-editor setti
n
g
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-13
Jonathan
N
iede
r
a
m
-i, g
i
t-s
v
n
: use "git var
GIT_PAGER
"
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-13
J
ona
t
han Nieder
ad
d
-i, se
n
d-email
,
svn, p4, et
c
: use "gi
t
var
G
IT_EDITO
R
"
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-13
Jonathan Nie
d
er
Te
a
ch
g
it
v
ar ab
o
u
t GIT_PAGER
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-13
J
onathan N
i
e
d
er
Teach g
i
t
va
r
about GI
T
_
EDITOR
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-13
Jonathan Niede
r
Suppress warnings f
r
om "git var -l"
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-13
Jonathan Nieder
Do not use VISUAL editor on dumb termin
a
ls
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan Nie
d
er
diff --no
-
index: m
a
ke th
e
usa
g
e string less scary
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-10
Jonatha
n
Nieder
merge
-
{recursive,subtree}
:
u
s
e usagef() to p
r
int usage
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan Nie
d
er
I
n
troduce usage
f
() tha
t
t
a
k
es
a print
f
-
style for
m
at
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan Nied
e
r
L
e
t
'
g
it <command> -h' show usage with
o
ut a
git dir
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan
N
ieder
Show usage string
for '
g
i
t
http-push -h'
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-10
J
o
na
t
han Nieder
Let 'git h
t
t
p-fetch -h' show usage outs
i
de an
y
git
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-10
Jonatha
n
Nieder
Show usage string
f
o
r 'git stripspace -h'
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-10
Jonat
h
an
N
ieder
Show usage string
for 'git unpack
-
file -h'
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan Ni
e
der
Show
usage
s
tring for 'git show-in
d
ex -h'
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-10
Jonat
h
a
n Nieder
Show usage string fo
r
'
g
it r
e
v-parse -h
'
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-10
Jonat
h
an Nieder
Show usa
g
e string for
'
git mer
g
e-one-file -h
'
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-10
Jon
a
than Nieder
Show usag
e
string for 'git mailsplit -h'
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-10
Jonat
h
an Niede
r
Sh
o
w usage string
for 'git imap-send -h'
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan Nied
e
r
Sho
w
usage
s
tri
n
g f
o
r
'git get-
t
ar
-
commit-id -h'
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-10
J
on
a
t
h
an Nied
e
r
Sh
o
w usage string for 'git fast-import -h
'
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-10
Jonat
h
an
N
i
e
der
Show
u
sa
g
e str
i
ng for 'g
i
t
check-
r
ef-for
m
at -h
'
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-10
Jonath
a
n Nieder
http-fetch: add mi
s
s
i
ng initialization
of argv0_path
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan
N
i
eder
merge: do n
o
t setup worktree t
w
ice
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-10
Jona
t
han
N
ieder
check-ref-format: u
p
date usage strin
g
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan Nieder
Show
us
a
g
e
string for 'git sh
o
w-ref -
h
'
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
next