repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
instaweb: Be more clear if httpd or the browser fail
2006-07-26
Joha
n
nes Sch
i
ndelin
instaweb: B
e
m
ore cle
a
r if httpd or
t
he browser fai
l
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-07-26
Johannes Schindel
i
n
git-cvsserver: support
mul
t
iline commit messages
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-07-26
Johannes Schindelin
t
7
001:
a
dd tes
t
for git-mv dir1 di
r
2
/
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-07-26
Johannes
S
ch
i
ndelin
g
i
t
web: fix
two warnin
g
s
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-07-26
Johannes Schi
n
delin
g
it-
i
nsta
w
eb: respect bindir from Ma
k
e
f
i
l
e
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-07-26
Johan
n
e
s
Schindeli
n
git-in
s
taweb: some Apache
h
av
e
mod_c
g
i builtin
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-07-25
Johannes Sch
i
ndelin
cvsserv
e
r:
a
vo
i
d wa
r
ni
n
g
about active db ha
n
dles
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-07-25
Joh
a
nnes Sch
i
ndelin
cvsserve
r
:
s
uppress warnings
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-07-24
Johanne
s
Sc
h
in
d
elin
Al
w
ays reset the col
o
r _before
_
pr
i
nting out the n
e
wline
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-07-24
J
o
h
annes Schinde
l
in
Fix t4114 on cyg
w
in
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-07-10
Jo
h
annes Schindeli
n
Fix linki
n
g
f
or not
-
so-clever
linkers
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-07-08
Johannes S
c
hindelin
C
lose the index file between wr
i
ting
a
nd
c
o
mmitting
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-07-07
Johannes Sc
h
i
ndelin
Makefile: export NO_S
V
N
_
TE
S
TS
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-07-04
Johannes Schi
n
delin
Make git-fmt-me
r
ge-msg a builtin
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-07-02
Joha
n
ne
s
S
chindelin
Ma
k
efile:
replace ugly and u
n
p
ort
a
ble sed invoca
t
ion
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-06-29
Johann
e
s Sch
i
n
d
elin
move get_merge_bas
e
s() t
o
c
o
re
l
ib
.
commit
|
commitdiff
|
tree
2006-06-29
Joha
n
n
e
s Schind
e
lin
refactor merg
e
_base
s
()
as prepara
t
i
o
n to libify merge
.
.
.
commit
|
commitdiff
|
tree
2006-06-28
Johan
n
es
Sc
h
indelin
Save errno in
h
andl
e
_alias()
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-06-27
Johannes Schindelin
format-patch: use
c
lear_commit
_
marks() i
n
s
tead of some
.
.
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-06-27
Johannes Schindelin
t401
4
: fix for whites
p
ace from "wc -l"
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-06-26
J
o
hanne
s
S
c
hindelin
f
or
m
at-patc
h
:
i
n
tr
o
duce "--ign
o
re
-
if-i
n
-upst
r
eam"
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-06-26
Joha
n
nes Schin
d
e
lin
add diff_f
l
ush_patch_id() to c
a
l
c
ulate the patch id
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-06-25
Jo
h
an
n
es Schindel
i
n
appl
y
: re
p
lace NO
_
ACCURATE_
D
IFF with --inaccurate-eof
.
.
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-06-25
Johannes Schindelin
c
v
simport: alway
s
set $EN
V
{G
I
T
_IN
D
EX_FIL
E
} to $index
.
.
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-06-24
Johannes Schi
n
delin
Teach diff about -b
a
nd -w flags
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-06-23
Johannes
Schinde
l
in
patch
-
id: take "
c
o
m
mit" prefix as
well as
"diff-tree
.
.
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-06-20
J
ohann
e
s Sch
i
ndelin
git_
c
onfig: access() retu
r
ns 0 on
s
u
c
cess,
not > 0
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-06-20
Johannes Schi
n
delin
repo-config: Fix late-night bug
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-06-20
Johannes Schind
e
l
i
n
Re
a
d configuration
a
lso from $HO
M
E
/
.
gitcon
f
ig
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-06-20
J
o
ha
n
ne
s
S
c
hindelin
Fix se
t
ting
confi
g
variables with a
n
alternative GIT_CONF
I
G
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-06-20
J
o
hannes
S
c
h
i
ndelin
I
n
i
tialize
lock_file
s
t
ru
c
t to all
z
er
o
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-06-18
J
ohan
n
e
s Schi
n
deli
n
diff
opt
i
ons:
a
dd --c
o
lor
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-06-06
J
o
hannes S
c
hinde
l
i
n
If
you have a
c
o
nfig c
o
ntaining some
t
h
i
n
g like this:
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-06-02
Johannes Schindelin
format-
p
atc
h
: resu
r
rect extra he
a
ders f
r
om config
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-05-31
Johannes Schindeli
n
send-email: only '
r
equir
e
' in
s
tead of
'
use' Net::
S
MTP
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-05-26
Johannes Schindelin
git-format-patch
-
-start
-
number <
n
>
commit
|
commitdiff
|
tree
2006-05-21
Joha
n
nes Sc
h
indelin
fm
t
-patch:
S
upport --at
t
a
c
h
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-05-21
Johanne
s
Schindelin
diff family: add --check option
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-05-07
Jo
h
annes Schind
e
lin
Fix c
r
a
s
h when readi
n
g the
empty tree
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-05-07
Johannes
Schindelin
Fix user
s
of prefix_p
a
th() to
fre
e
() only whe
n
necessary
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-05-07
Joh
a
n
nes S
c
hin
d
elin
Fix u
s
ers o
f
prefix_path()
t
o free() only when nec
e
s
sa
r
y
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-05-06
Joh
a
n
n
es S
c
hindelin
f
mt-
p
atch: understand old <h
i
s>
notati
o
n
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-05-05
Joh
a
n
n
es
Sc
h
i
n
delin
repo-conf
i
g:
t
rim white-spac
e
b
efor
e
c
om
m
ent
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-05-05
Johanne
s
Schindelin
Te
a
ch fmt-patch ab
o
ut --keep-subject
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-05-05
Johannes
S
chindelin
T
each f
m
t-pa
t
ch about --num
b
ered
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-05-05
Johannes Schindelin
fmt-patch: im
p
lement -o <dir>
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-05-05
Joha
n
n
es Sc
h
i
ndelin
f
m
t-patch: output file names to
s
tdout
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-05-05
Joha
n
nes Schindelin
Tea
c
h fm
t
-patc
h
to writ
e
individual fil
e
s
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-05-05
Johannes Sch
i
ndel
i
n
builtin-push: --a
l
l
and --tags _are_
expl
i
c
it refspecs
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-05-04
J
o
hannes Sch
i
n
d
elin
A
dd a co
n
ver
s
io
n
t
o
ol to migr
a
te remote
i
nformation
.
.
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-05-04
Johannes Schindelin
f
e
tch
,
pul
l
: ask c
o
nfig for
r
emote
i
nfor
m
ati
o
n
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-05-03
Johanne
s
Schinde
l
in
repo-config: deconvolut
e
logics
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-05-03
J
ohannes
Schin
d
elin
r
e
p
o-
c
onfig: support -
-
ge
t
-regexp
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-05-02
Joha
n
nes S
c
h
indelin
repo-c
o
nfig: tr
i
m white-space
before comment
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-05-02
Johann
e
s Schindelin
rep
o
-co
n
fig: fix se
g
fau
l
t with no ar
g
ument
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-05-02
Johan
n
es
Sc
h
i
ndelin
fetc
h
,
pull: as
k
config f
o
r remote informat
i
on
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-05-02
Johann
e
s Schindelin
b
u
ilt
i
n-push: also as
k
con
f
ig fo
r
re
m
ote
information
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-05-02
Johanne
s
S
chindelin
ca
c
he-tree:
r
eplace a sscanf() by two strtol() calls
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-04-30
Johannes S
c
hindelin
builtin-push: res
u
r
r
e
ct parsin
g
of Push
:
li
n
e
s
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-04-16
Johannes Schindelin
p
ager: do no
t
fork a pa
g
er
i
f PAGER is set to
e
m
pty
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-04-16
Johann
e
s
S
chindeli
n
diff-op
t
ion
s
:
add --patc
h
-with-stat
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-04-13
J
o
h
annes Schindelin
dif
f
-options: add --stat (t
a
ke 2)
commit
|
commitdiff
|
tree
2006-04-13
Johann
e
s Sch
i
ndeli
n
di
f
f-options: add --stat (
t
ake 2)
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-04-05
Johanne
s
Schindelin
Fix compil
e
with e
x
pat,
bu
t
an old curl ve
r
sion
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-04-05
Joha
n
nes
Sc
h
indelin
On some platforms, certain heade
r
s
n
e
ed to
b
e inclu
d
ed
.
.
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-04-05
Johannes Sc
h
indelin
cvsi
m
p
o
rt:
u
se git-update-ref when
upd
a
ting
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-03-27
Johannes Schindel
i
n
Remove dependency on a
file n
a
med "-lz"
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-03-12
Johannes Schindelin
i
map-send: Ad
d
missin
g
#include for
macosx
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-03-03
Johannes Schindelin
Fix test case for some se
d
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-03-01
Johannes Schindelin
Warn
a
bo
u
t in
v
a
l
id
r
e
fs
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-02-22
Johan
n
es Sc
h
indelin
Use Ryan's git
-
annotate instead of jsannotate
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-02-22
Johannes Schind
e
lin
Fi
x
"gmake -j"
commit
|
commitdiff
|
tree
2006-02-20
Johannes
S
ch
i
n
delin
R
eally h
o
nour NO_PYTHON
commit
|
commitdiff
|
tree
2006-02-20
Johann
e
s Schindelin
avoid makefile ov
e
rri
d
e warning
commit
|
commitdiff
|
tree
2006-02-19
J
ohannes Schindelin
Fix
e
s for ancient versions of GN
U
make
commit
|
commitdiff
|
tree
2006-02-19
J
o
hannes Sch
i
ndelin
Op
t
ionally work with
o
ut python
commit
|
commitdiff
|
tree
2006-02-18
J
o
hannes Schin
d
eli
n
Sup
p
ort I
r
i
x
commit
|
commitdiff
|
tree
2006-02-18
Johan
n
es Schindelin
O
pti
o
nally suppor
t
old d
i
ffs
commit
|
commitdiff
|
tree
2006-02-18
J
o
han
n
es Schindeli
n
Fix cpio call
commit
|
commitdiff
|
tree
2006-02-12
Johannes
S
chindeli
n
U
se a hashtable for
objects instead
of a sort
e
d list
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-01-20
Johanne
s
Schindel
i
n
git-fetch-pack: really do not ask for funny refs
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2006-01-11
Johan
n
e
s
Sch
i
ndelin
glossary: expl
a
in "mast
e
r
"
and
"
origi
n
"
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2005-12-27
J
o
hannes Schind
e
lin
Handl
e
symlinks g
r
aciously
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2005-12-24
Johann
e
s Schindelin
git-init-db
:
ini
t
ialize
s
hare
d
repositories with -
.
.
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2005-12-24
Johannes Schind
e
li
n
Introduce c
o
r
e
.
sharedrepo
s
itory
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2005-12-23
Johann
e
s S
c
hindelin
gi
t
-clone:
Support changing t
h
e
origin branch with -o
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2005-12-22
Johannes Schindel
i
n
sha1
_
to_hex: pro
p
erly terminate t
h
e SH
A
1
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2005-12-22
Johannes Schind
e
li
n
git-format-patch should sho
w
t
he correct
version
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2005-12-21
J
o
hannes Schindelin
Avoid misl
e
a
di
n
g succes
s
mess
a
ge
on error
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2005-12-16
Joha
n
n
es S
c
hindelin
We do not like "HEA
D
"
as
a
ne
w
branch n
a
me
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2005-11-29
Johannes Schindelin
[PATCH]
M
ake git-mv work in subdirec
t
ories,
t
oo
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2005-11-24
Johanne
s
Schi
n
delin
R
enam
e
git-con
f
ig-set to git-repo-config
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2005-11-21
J
o
hannes
S
c
h
inde
l
in
Al
l
ow hierarc
h
ical s
e
ction names
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2005-11-21
Johannes Schi
n
delin
git-co
n
f
ig-set: Properly te
r
minate strings
with '\0'
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2005-11-20
Joha
n
ne
s
Schindelin
git-config-set: support selecting
v
alues by non-ma
t
c
h
ing
.
.
.
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2005-11-20
Joha
n
nes Schindelin
git-config-set: add mor
e
opt
i
ons
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2005-11-20
Johan
n
es Schindelin
Add test case for git-
c
on
f
i
g-set
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2005-11-20
Johanne
s
Schindelin
Add
d
o
cumenta
t
io
n
fo
r
git-config-set
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
2005-11-20
J
o
ha
n
n
e
s Schindelin
Add
g
i
t
-c
o
nfig-set,
a simpl
e
hel
p
er for scripts t
o
.
.
.
Signed-off-by:
Johannes Schindelin
<johannes.schindelin@gmx.de>
commit
|
commitdiff
|
tree
2005-11-20
Joha
n
n
es Schindelin
Add funct
i
o
ns g
i
t_con
f
ig_set()
and
g
it_config_set_multivar()
Signed-off-by:
Johannes Schindelin
<Johannes.Schindelin@gmx.de>
commit
|
commitdiff
|
tree
next