repo.or.cz
/
git
/
jnareb-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
annotate: use pager
2007-01-24
Jo
h
annes Sc
h
indelin
annotat
e
: use pager
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2007-01-21
Joh
a
nnes
S
chin
d
elin
--
w
alk-r
e
flogs: do
n
o
t
crash with cyc
l
ic reflog ancestry
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2007-01-21
Joha
n
ne
s
Schin
d
elin
--walk-re
f
logs: actually find the right com
m
it by date
.
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2007-01-21
Johannes Schinde
l
in
--walk
-
re
f
logs
:
disallow uninteresting
commi
t
s
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2007-01-21
Johan
n
es Schindelin
Te
a
c
h the revision w
a
l
ke
r
to wa
l
k by
reflogs with
.
.
.
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2007-01-21
Johanne
s
Schi
n
delin
Do not verif
y
filenames
in a bare rep
o
sit
o
ry
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2007-01-21
Johannes Schindeli
n
apply -
-
cached: fi
x
crash in subdirectory
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2007-01-21
J
o
ha
n
nes Schinde
l
in
show_da
t
e(): fix relative dates
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2007-01-20
Joh
a
nnes
S
chinde
l
in
confi
g
_set_mul
t
ivar(
)
:
d
isallow n
e
wlines in keys
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2007-01-16
Johannes Sc
h
indelin
F
i
x spuriou
s
com
p
ile err
o
r
...by: Johannes E. Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2007-01-10
Joh
a
nnes Sc
h
inde
l
i
n
Fix
t1410
for core
.
f
i
l
e
m
ode==false
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2007-01-09
Johann
e
s Schin
d
elin
Sanitize
f
or_each_r
e
flog_ent()
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-12-31
Joha
n
nes Schin
d
eli
n
Fix yet another
subtle xdl_merge()
bug
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-12-28
Johannes Schindelin
xdl_merge(): fix a
s
egmentation
f
au
l
t when refining
.
.
.
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-12-24
Johann
e
s
Schinde
l
in
commit-tree: enc
o
u
r
age UTF-8 commit messa
g
es
.
commit
|
commitdiff
|
tree
2006-12-22
Johanne
s
Schindel
i
n
M
a
k
e
g
it-rerere a builtin
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-12-22
Johannes Schindeli
n
Add a test
f
or gi
t
-rerere
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-12-22
J
o
hannes Schindelin
m
o
v
e read_mmf
i
le() into x
d
iff-inter
f
a
c
e
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-12-22
Johann
e
s Schindeli
n
g
i
t-reset
--hard: tell the user what the
HE
A
D
was reset
t
o
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-12-22
Johann
e
s
Schindelin
git-tag:
s
upport -F <file> option
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-12-22
J
o
hannes Sch
i
ndelin
Use git-merg
e
-f
i
le in git
-
merge-one-
f
ile, too
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-12-22
Johannes S
c
hindel
i
n
dif
f
--check: fix o
f
f by
o
ne
error
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-12-19
Johannes Schindelin
Introduce GIT_TE
M
PLAT
E
_DIR
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-12-16
Johannes Schindel
i
n
g
i
t
-
branch: rename con
f
ig
vars branch
.
<branch>
.
*, too
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-12-16
Johanne
s
S
chindelin
ad
d
a function
t
o rename sec
t
ions
i
n the config
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-12-16
Johannes Schindelin
Docume
n
t g
i
t-mer
g
e-file
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-12-14
Johannes Schindelin
git-show: grok
b
lo
b
s, trees
a
n
d tags
,
too
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-12-14
J
o
hann
e
s Schin
d
elin
INSTALL: no need to have GN
U
diff ins
t
alled
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-12-13
Johann
e
s
Schi
n
delin
merge-recursi
v
e: add/ad
d
really is
m
o
dif
y
/modify with
.
.
.
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-12-13
Joha
n
nes Sch
i
ndelin
Get rid of the
d
ependen
c
y
on RCS' merge program
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-12-06
Johannes Sc
h
indelin
m
e
rge-file: support -p and -q;
f
ix compi
l
e
w
arning
s
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-12-06
Johannes Schind
e
l
in
Add builtin merge-
f
ile
,
a
minimal replac
e
ment for RC
S
.
.
.
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-12-06
Johann
e
s
Schindelin
cvs-
m
igr
a
tion document: make the
need
f
or "push" more
.
.
.
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-12-05
Johannes
Sc
h
indelin
xdl_merg
e
(): fix and simplify conflict handl
i
ng
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-12-05
Johannes Schin
d
e
li
n
di
f
f
-b: ignore whitespace at
end of line
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-12-04
Jo
h
annes Sch
i
ndelin
git-mv: search more precisely for source
directory
.
.
.
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-12-03
Joha
n
ne
s
Schin
d
elin
x
dl_me
r
g
e
():
f
ix thin
k
o
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-12-03
Johannes Schin
d
e
l
i
n
xdl
_
merge
(
): fix
a
n of
f
-by-o
n
e bug
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-12-03
J
o
h
an
n
es Schindelin
xdiff: a
d
d
xdl_me
r
ge()
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-11-28
Joha
n
nes Schindelin
sha1_object
_
info(): be con
s
istent with r
e
ad_sha1_file()
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-11-28
J
ohannes Schindelin
shortlog: use pager
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-11-24
Johannes Schinde
l
i
n
add tests
f
or shallow stuff
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-11-24
Johannes Schindelin
allow de
e
pe
n
i
n
g of
a
sh
a
ll
o
w
r
eposit
o
ry
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-11-24
Johannes Schinde
l
in
allo
w
cloning a repo
s
itory "s
h
allowly"
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-11-24
J
ohannes
S
chindelin
support fe
t
ching into
a
shallow reposi
t
ory
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-11-24
Johannes
Schindelin
upload-pack: no longer call rev
-
list
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-11-21
Johannes
S
c
h
in
d
elin
shortlog: fix "-n"
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-11-20
Johannes
S
chindelin
shortlog: handle
e
m
a
il addresses case-insensitively
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-11-20
Johann
e
s Schindelin
shortlog:
read mailmap from
.
/
.
mailmap again
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-11-20
Johannes Sc
h
indelin
shortlog: do
not crash
on
parsing "[PAT
C
H"
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-11-20
Johannes Schindelin
B
u
ild in sh
o
rtlog
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-11-15
Johanne
s
S
chindeli
n
Seek back
to curre
n
t filepos when mmap(
)
ing wi
t
h NO_MMAP
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-11-03
Johannes
Schi
n
delin
link_temp_to_file: cal
l
adjust
_
shared_perm() o
n
ly
w
h
e
n
.
.
.
commit
|
commitdiff
|
tree
2006-10-15
Johan
n
es Sc
h
indelin
cvsserver: fix "cvs
diff" in a
sub
d
i
rectory
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-10-15
J
o
h
a
n
ne
s
Schi
n
delin
cvs
s
er
v
er: S
h
ow correc
t
let
t
ers for
m
o
difi
e
d,
remov
e
d
.
.
.
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-10-12
Johannes Sc
h
i
n
d
e
lin
diff: fix
2
whitespace
i
ssues
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-10-05
Johannes Sc
h
indelin
Turn on recursive with
-
-su
m
m
a
ry
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-09-29
Jo
h
annes Schindeli
n
diff --stat:
en
s
ure
at least
o
n
e
'-' for deletion
s
.
.
.
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-09-28
Johanne
s
Sc
h
in
d
elin
daemon:
default to 256 fo
r
H
OST_NAME_
M
AX if it is not
.
.
.
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-09-28
Jo
h
ann
e
s Sc
h
inde
l
in
runstat
u
s: do
n
ot recurse into subdirect
o
ries
i
f
not
.
.
.
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-09-22
J
ohannes Sch
i
nd
e
lin
show
-
branch:
mark active b
r
a
nch with
a
'
*' again
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-09-22
J
o
han
n
es Schin
d
elin
Fix
g
it-update-index
-
-ag
a
in
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-09-21
J
ohannes
S
c
hindelin
Docum
e
n
t
receive
.
denyNonFast
f
orwar
d
s
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-09-21
Jo
h
annes Schinde
l
in
recei
v
e-pa
c
k: plug memo
r
y leak in fast-forward checking
.
.
.
commit
|
commitdiff
|
tree
2006-09-20
J
o
hannes Schindelin
a
dd
receive
.
denyNonFastfo
r
wards c
o
nfig v
a
ria
b
le
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-09-13
Johan
n
es S
c
h
indeli
n
Teach runst
a
tu
s
about --untracked
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-09-01
Joh
a
nn
e
s
Sch
i
ndelin
fmt
-
merge-msg
:
f
i
x off-by-on
e
bug
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-08-29
Johannes Schindelin
Remo
v
e uneeded #inc
l
ude
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-08-29
Johannes Schi
n
deli
n
Mak
e
file: fix typo
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-08-29
Johanne
s
Sc
h
indelin
unp
a
ck
-
objects:
r
emove unused vari
a
ble "eof"
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-08-21
Johan
n
es Schin
d
elin
builti
n
-
m
v
: readab
i
lity pat
c
h
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-08-21
Johannes Schindelin
gi
t
-mv:
f
i
x
o
ff-by-one error
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-08-21
J
o
h
a
nnes Schindelin
git-mv: sp
e
cial case d
e
stinati
o
n "
.
"
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-08-21
J
o
han
n
es Schin
d
el
i
n
buil
t
i
n-mv: readability patch
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-08-16
Johan
n
es Sch
i
ndel
i
n
[PAT
C
H]
g
it-mv: add mo
r
e p
a
th n
o
rmal
i
z
ation
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-08-16
Joha
n
nes Schindelin
git-mv:
suc
c
eed
even if source is a prefix o
f
destinatio
n
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-08-10
Johannes Schindelin
Add the --colo
r
-
w
o
r
ds o
p
tion
to the diff op
t
i
ons f
a
mily
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-08-10
J
oh
a
nnes Schindelin
disca
r
d
_cache(): discard
index, even if no file was
.
.
.
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-08-09
J
o
hannes Schindel
i
n
merge-recur: do not d
i
e
unne
c
e
ssarily
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-08-09
Joh
a
nnes Schindelin
mer
g
e-recur: try
t
o
merge older mer
g
e bases fir
s
t
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-08-09
Joha
n
nes
Schinde
l
in
merge
-
rec
u
r: if
t
h
ere is no common ancestor, fake empty one
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-08-09
Johannes Schindel
i
n
merg
e
-recur:
do not
setenv("GIT_INDE
X
_FILE"
)
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-08-09
Johann
e
s
S
chi
n
delin
merge-recur: do n
o
t
c
a
l
l gi
t
-write-tree
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-08-05
Johannes Schindelin
h
ttp-p
u
sh
:
avoid
for
k
() by calling merge_bases() directly
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-08-04
J
o
hannes Schindelin
merge-recursive: fix rename handling
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-08-04
J
oh
a
nnes Schi
n
del
i
n
Fix crash
w
hen GIT_DI
R
is invalid
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-07-31
J
o
hanne
s
Schindelin
merge-
r
ecur: vi
r
tu
a
l comm
i
ts shall never
b
e parsed
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-07-31
J
ohannes Schin
d
elin
merge-
r
ecur:
u
se
t
he unpack_
t
rees() inter
f
ace instead
.
.
.
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-07-31
Joh
a
nnes Schi
n
delin
read-tree
:
move merge funct
i
o
n
s to
t
h
e
library
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-07-31
Johannes Schin
d
el
i
n
read-trees: re
f
actor the
unpack_trees(
)
pa
r
t
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-07-31
Johannes Schindelin
tar-tree:
i
llu
s
t
r
ate an o
b
scu
r
e feat
u
re better
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-07-30
Johannes
S
chindelin
merge-re
c
u
r
: f
i
x thinko in unique_pa
t
h()
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-07-29
Johannes Schind
e
lin
Fix h
t
tp-f
e
tch
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-07-28
Johannes Sc
h
indelin
T
e
ach gi
t
-
a
pply abo
u
t
'-R'
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-07-28
J
ohannes S
c
hindelin
M
akefile:
ssh-pull
.
o depends on
s
sh-fetch
.
c
...off-by: Johannes Schindelin <
Johannes.Schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-07-28
J
ohannes Schind
e
lin
m
e
r
g
e
-recur: Explain
w
hy sha_
e
q
() and struct stage_
d
ata
.
.
.
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-07-28
J
ohann
e
s Sch
i
ndelin
merge-re
c
ur: C
l
eanup
l
ast mixedCase variables
.
.
.
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-07-28
Johanne
s
Schinde
l
in
merge-rec
u
r
: Fix compiler warning wi
t
h -
p
edantic
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-07-28
J
o
han
n
es Schinde
l
i
n
merge-recur: R
e
move dead code
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
2006-07-28
Joha
n
nes Schind
e
l
in
merge-recur: Get ri
d
of debug co
d
e
...off-by: Johannes Schindelin <
johannes.schindelin@gmx.de
>
commit
|
commitdiff
|
tree
next