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
config.txt: add missing format.{subjectprefix,cc,attach} variables
2009-04-20
J
o
hannes Sixt
W
indows: Skip fsta
t
/l
s
tat optimizat
i
on in write_entry()
Signed-off-by:
Johannes Sixt
<j6t@kdbg.org>
commit
|
commitdiff
|
tree
2009-04-20
Johannes Sixt
Windows: Work around intermitten
t
failures i
n
m
i
ngw_rename
Signed-off-by:
Johannes Sixt
<j6t@kdbg.org>
commit
|
commitdiff
|
tree
2009-04-12
Johannes Sixt
t1301
-
s
har
e
d-re
p
o:
fix forced modes test
Signed-off-by:
Johannes Sixt
<j6t@kdbg.org>
commit
|
commitdiff
|
tree
2009-03-25
Joh
a
nnes Sixt
t750
2
-commit
:
S
kip SIGTERM test
on Wi
n
dows
Signed-off-by:
Johannes Sixt
<j6t@kdbg.org>
commit
|
commitdiff
|
tree
2009-03-25
Johannes S
i
xt
t7005-edito
r
: Use $SHELL_PATH
in t
h
e e
d
i
tor scri
p
ts
Signed-off-by:
Johannes Sixt
<j6t@kdbg.org>
commit
|
commitdiff
|
tree
2009-03-25
Johannes Sixt
diff
--
n
o-index: Do not
generate pa
t
ch output if othe
r
.
.
.
Signed-off-by:
Johannes Sixt
<j6t@kdbg.org>
commit
|
commitdiff
|
tree
2009-03-24
J
ohannes S
i
xt
MinGW: Quote a
r
gumen
t
s for subprocess
e
s t
h
at contain
.
.
.
Signed-off-by:
Johannes Sixt
<j6t@kdbg.org>
commit
|
commitdiff
|
tree
2009-03-22
Johannes Sixt
t5503: GIT_DEBUG_SE
N
D_P
A
C
K is
not supported on Min
G
W
Signed-off-by:
Johannes Sixt
<j6t@kdbg.org>
commit
|
commitdiff
|
tree
2009-03-22
Johan
n
es Sixt
t
7004:
Use prerequi
s
ite ta
g
s to skip tests tha
t
n
e
e
d
gpg
Signed-off-by:
Johannes Sixt
<j6t@kdbg.org>
commit
|
commitdiff
|
tree
2009-03-22
Joha
n
nes Sixt
Us
e
prerequi
s
i
t
es to skip tests that need unzip
Signed-off-by:
Johannes Sixt
<j6t@kdbg.org>
commit
|
commitdiff
|
tree
2009-03-22
Johannes Sixt
t
3
700:
Skip a test with backsl
a
shes in p
a
thspec
Signed-off-by:
Johannes Sixt
<j6t@kdbg.org>
commit
|
commitdiff
|
tree
2009-03-22
Joha
n
nes Si
x
t
Skip tests that require a filesystem th
a
t obeys
POSIX
.
.
.
Signed-off-by:
Johannes Sixt
<j6t@kdbg.org>
commit
|
commitdiff
|
tree
2009-03-22
Johan
n
es
Sixt
t0060: Fix tests on
Windows
Signed-off-by:
Johannes Sixt
<j6t@kdbg.org>
commit
|
commitdiff
|
tree
2009-03-22
Johannes Si
x
t
Use prerequisite ta
g
s to s
k
ip tests that de
p
e
nd on
.
.
.
Signed-off-by:
Johannes Sixt
<j6t@kdbg.org>
commit
|
commitdiff
|
tree
2009-03-22
Jo
h
annes Six
t
t9
1
00, t9129: Use p
r
erequis
i
te
tags for UTF-8 test
s
Signed-off-by:
Johannes Sixt
<j6t@kdbg.org>
commit
|
commitdiff
|
tree
2009-03-22
Johan
n
es
S
i
xt
t
5
3
0
2: Use prerequisite tags to skip 64-bit offset
.
.
.
Signed-off-by:
Johannes Sixt
<j6t@kdbg.org>
commit
|
commitdiff
|
tree
2009-03-22
Johannes
Sixt
S
k
i
p t
e
sts that fai
l
if the executable bit is not handled
.
.
.
Signed-off-by:
Johannes Sixt
<j6t@kdbg.org>
commit
|
commitdiff
|
tree
2009-03-22
Johannes
Sixt
t
3
6
00: Use test
p
r
erequisite tags
Signed-off-by:
Johannes Sixt
<j6t@kdbg.org>
commit
|
commitdiff
|
tree
2009-03-22
Johannes Sixt
Propag
a
te --exec-path sett
i
n
g
t
o
e
x
ter
n
al comma
n
ds
.
.
.
Signed-off-by:
Johannes Sixt
<j6t@kdbg.org>
commit
|
commitdiff
|
tree
2009-03-21
Johannes Sixt
test-lib: In
f
rastructure to
test and
c
heck
f
or p
r
erequis
i
tes
Signed-off-by:
Johannes Sixt
<j6t@kdbg.org>
commit
|
commitdiff
|
tree
2009-03-19
Johann
e
s Sixt
t
0050:
C
heck whether git
init detect
e
d sym
b
olic link
.
.
.
Signed-off-by:
Johannes Sixt
<j6t@kdbg.org>
commit
|
commitdiff
|
tree
2009-03-19
Johan
n
es Sixt
Tests on
W
ind
o
w
s
: $(pwd) must
r
et
u
rn Wind
o
ws-style
.
.
.
Signed-off-by:
Johannes Sixt
<j6t@kdbg.org>
commit
|
commitdiff
|
tree
2009-03-19
Johannes Sixt
test-lib
:
Work around missing sum o
n
Wi
n
dows
Signed-off-by:
Johannes Sixt
<j6t@kdbg.org>
commit
|
commitdiff
|
tree
2009-03-19
J
ohanne
s
S
i
xt
test-li
b
: Work ar
o
und inc
o
mpati
b
le sort and
find on
.
.
.
Signed-off-by:
Johannes Sixt
<j6t@kdbg.org>
commit
|
commitdiff
|
tree
2009-03-19
Johannes
Sixt
t5602: Work around
path mangling on MSYS
Signed-off-by:
Johannes Sixt
<j6t@kdbg.org>
commit
|
commitdiff
|
tree
2009-03-19
Johan
n
es S
i
x
t
t5300, t5302, t5303:
D
o not use /dev/zer
o
Signed-off-by:
Johannes Sixt
<j6t@kdbg.org>
commit
|
commitdiff
|
tree
2009-03-19
Johann
e
s Sixt
t
2
200,
t
7
0
0
4: Avoid glob pattern that also matc
h
e
s
.
.
.
Signed-off-by:
Johannes Sixt
<j6t@kdbg.org>
commit
|
commitdiff
|
tree
2009-03-19
Johannes Sixt
test-lib: In
t
roduce test_chmod and use it
i
nstead of
.
.
.
Signed-off-by:
Johannes Sixt
<j6t@kdbg.org>
commit
|
commitdiff
|
tree
2009-03-19
Johannes Sixt
test-lib: Si
m
plif
y
test
counti
n
g
.
Signed-off-by:
Johannes Sixt
<j6t@kdbg.org>
commit
|
commitdiff
|
tree
2009-03-19
Johannes
S
ixt
test-lib:
Replace use
s
of
$
(expr
.
.
.
) by
P
OSIX shell
.
.
.
Signed-off-by:
Johannes Sixt
<j6t@kdbg.org>
commit
|
commitdiff
|
tree
2009-03-19
Johannes Six
t
Call 'say' outside test_e
x
pect_
s
u
c
cess
Signed-off-by:
Johannes Sixt
<j6t@kdbg.org>
commit
|
commitdiff
|
tree
2009-03-19
Johan
n
es
S
ixt
test
s
uite
:
Use 's
a
y' t
o
s
a
y
something instead of
.
.
.
Signed-off-by:
Johannes Sixt
<j6t@kdbg.org>
commit
|
commitdiff
|
tree
2009-03-18
Joh
a
n
n
e
s Sixt
t9400, t9401: Do not forc
e
hard-linked clone
Signed-off-by:
Johannes Sixt
<j6t@kdbg.org>
commit
|
commitdiff
|
tree
2009-03-14
J
ohannes S
i
xt
test-suite: Make
t
e
st script numbers uni
q
u
e
Signed-off-by:
Johannes Sixt
<j6t@kdbg.org>
commit
|
commitdiff
|
tree
2009-03-11
J
o
hannes Sixt
recv_s
i
deband:
Bands
#
2 and
#
3
a
lways g
o
to stderr
Signed-off-by:
Johannes Sixt
<j6t@kdbg.org>
commit
|
commitdiff
|
tree
2009-03-02
Joh
a
nnes Sixt
t
3
4
0
0-r
e
b
ase: Move detached HEAD
check earlier
Signed-off-by:
Johannes Sixt
<j6t@kdbg.org>
commit
|
commitdiff
|
tree
2009-02-25
Johannes Sixt
gitat
t
ributes
.
txt:
P
a
th matchi
n
g rules are
e
x
p
lained
.
.
.
Signed-off-by:
Johannes Sixt
<j6t@kdbg.org>
commit
|
commitdiff
|
tree
2009-02-07
Johanne
s
S
i
xt
Remove unused normalize_absolute_path()
Signed-off-by:
Johannes Sixt
<j6t@kdbg.org>
commit
|
commitdiff
|
tree
2009-02-07
Jo
h
ann
e
s Sixt
Test and fix normalize_pat
h
_copy()
Signed-off-by:
Johannes Sixt
<j6t@kdbg.org>
commit
|
commitdiff
|
tree
2009-02-07
Johannes Sixt
M
o
ve
s
anitary_
p
a
t
h_copy
(
) to pa
t
h
.
c and rename it
t
o
.
.
.
Signed-off-by:
Johannes Sixt
<j6t@kdbg.org>
commit
|
commitdiff
|
tree
2009-02-07
Johannes Sixt
Make test
-
pa
t
h-utils more robust against
i
ncor
r
ect use
Signed-off-by:
Johannes Sixt
<j6t@kdbg.org>
commit
|
commitdiff
|
tree
2009-01-28
Johan
n
es Sixt
Windows:
Fix intermi
t
tent failures of
t
7701
Signed-off-by:
Johannes Sixt
<j6t@kdbg.org>
commit
|
commitdiff
|
tree
2009-01-22
Johannes Sixt
Windows: Fi
x
signal numbers
Signed-off-by:
Johannes Sixt
<j6t@kdbg.org>
commit
|
commitdiff
|
tree
2008-12-21
Johannes Sixt
gitk: Fo
r
ce the foc
u
s to
t
he main window on Windows
Signed-off-by:
Johannes Sixt
<j6t@kdbg.org>
commit
|
commitdiff
|
tree
2008-12-21
Johannes Sixt
gitk: En
s
ure that "Res
e
t br
a
nch" menu entry i
s
ena
b
led
Signed-off-by:
Johannes Sixt
<j6t@kdbg.org>
commit
|
commitdiff
|
tree
2008-12-21
J
o
hann
e
s
Sixt
gitk:
U
se check-buttons' -text property instea
d
o
f
.
.
.
Signed-off-by:
Johannes Sixt
<j6t@kdbg.org>
commit
|
commitdiff
|
tree
2008-12-21
Johannes Sixt
rebase -i
-
p:
F
ix
-
-c
o
ntinue after a merge could
not
.
.
.
Signed-off-by:
Johannes Sixt
<j6t@kdbg.org>
commit
|
commitdiff
|
tree
2008-12-21
Johannes Sixt
Sho
w
a f
a
ilure of rebase
-p
if t
h
e
m
e
rg
e
h
a
d a
conflict
Signed-off-by:
Johannes Sixt
<j6t@kdbg.org>
commit
|
commitdiff
|
tree
2008-12-03
Jo
h
annes Sixt
t4030-diff-textco
n
v: Make octal escape se
q
u
en
c
e more
.
.
.
Signed-off-by:
Johannes Sixt
<j6t@kdbg.org>
commit
|
commitdiff
|
tree
2008-11-24
Johannes
S
ixt
comp
a
t/
m
ingw
.
c: Tea
c
h mi
n
gw_rename() to r
e
pla
c
e read
.
.
.
Signed-off-by:
Johannes Sixt
<j6t@kdbg.org>
commit
|
commitdiff
|
tree
2008-11-01
J
ohan
n
es
S
i
xt
git-
g
ui
:
Do not
m
unge
c
onflic
t
ma
r
ker line
s
in a normal
.
.
.
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2008-10-23
Johannes Sixt
git-remote:
list branches in vertical li
s
ts
Signed-off-by:
Johannes Sixt
<j6t@kdbg.org>
commit
|
commitdiff
|
tree
2008-10-10
Johannes Sixt
git-gui: Mark-
u
p strings in show_{other,
u
n
merged}_diff
.
.
.
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2008-10-10
Joha
n
nes Sixt
git-gui: Show a round number of bytes
o
f large untracked
.
.
.
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2008-10-10
J
ohannes Sixt
git-gui: Fix sw
i
tc
h
statement
i
n lib/merge
.
t
c
l
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2008-10-08
Johannes Si
x
t
git-p
u
sh
.
txt: Des
c
ribe
-
-repo option in more detail
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2008-09-30
Johannes Six
t
git
-
gui: Rem
o
ve s
p
ace from the end
of as
p
ell's
repl
y
.
.
.
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2008-09-30
Johannes
Sixt
git
-
g
u
i: Do
n
ot automatically sta
g
e file after merge
.
.
.
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2008-09-29
Joha
n
n
e
s
Sixt
compat/mingw: Support a time
o
ut i
n
the
p
oll em
u
lation
.
.
.
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2008-09-22
Johannes Sixt
git-remote: do
not use user i
n
p
u
t in a printf format
.
.
.
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2008-09-11
Johannes Sixt
Use compat
i
b
i
lity regex library also on AIX
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2008-09-08
Joh
a
nnes Sixt
Windows: git-sh
e
ll can be compi
l
ed ag
a
i
n
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2008-08-22
Johannes S
i
xt
filter-bran
c
h: Grok special characters in tag nam
e
s
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2008-08-20
J
ohannes Sixt
Insta
l
l temp
l
ates wit
h
th
e
user
and group of the
installing
.
.
.
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2008-08-19
Johannes Sixt
Rev
e
r
t
"Windows:
Use a customized
struct stat that
.
.
.
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2008-08-05
J
o
h
a
n
nes
S
ixt
git-gu
i
: Adapt discovery
o
f oguilib to execdir 'libexec
.
.
.
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2008-07-26
J
ohan
n
es Sixt
g
i
t-g
u
i: "Sta
g
e Line": Treat indepe
n
dent cha
n
ges i
n
.
.
.
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2008-07-26
J
ohannes Sixt
git-gui: Fi
x
"Stage/Un
s
tag
e
Line" with one line of
.
.
.
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2008-07-26
Johann
e
s
S
ixt
Window
s
: Do not compile
git
-
shell
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2008-07-26
Johannes Sixt
Windows: Make sure argv[0] has a path
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2008-07-26
Johannes Sixt
Windows:
M
a
ke $(gitexecdir)
relative
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2008-07-26
Johannes Sixt
Allow add_path() to
a
dd non-existent directo
r
ies to
.
.
.
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2008-07-26
J
o
hannes Six
t
All
o
w t
h
e
b
u
ilt-in exec path to be r
e
lative
to the
.
.
.
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2008-07-26
Johannes
Sixt
Fix relative built-in paths to be relative to the command
.
.
.
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2008-07-26
Johannes Sixt
Record the command inv
o
cation path earl
y
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2008-07-26
Johannes Sixt
M
akefile: Normalize $(bindir)
a
nd $(gitexec
d
ir)
b
efore
.
.
.
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2008-07-26
J
ohannes Six
t
M
a
k
e
fi
l
e
: Do n
o
t
i
nstall a copy of 'git'
in
$
(gitexecdir)
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2008-07-23
Johannes Sixt
rebase
-
i: When an 'edi
t
'
stops
,
ment
i
o
n
t
he com
m
it
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2008-07-19
Johannes Sixt
builtin-clone: rewrite guess_dir_name()
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2008-07-16
Johannes
S
i
x
t
t7600-merge:
U
se
test_expect_failure to test
o
pt
i
on
.
.
.
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2008-07-09
Johann
e
s Sixt
P
rovide fa
l
lback defi
n
itions of PRIu32 and PRI
x
32
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2008-07-04
Johannes
Sixt
t4127-apply-
s
am
e
-
f
n:
A
void sed -i
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2008-07-02
Johannes Sixt
git-gui: Imp
l
eme
n
t "Stage/U
n
stage
Line
"
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2008-06-26
Johan
n
es Sixt
W
indows: T
M
P and TEMP
e
nvironmen
t
variab
l
es
s
pecify
.
.
.
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2008-06-26
Johann
e
s Sixt
Windows: Make 'git help
-
a
'
w
ork
.
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2008-06-26
Joha
n
nes S
i
xt
Windows:
Work around an
oddit
y
whe
n
a
pipe
with
no
.
.
.
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2008-06-26
Johannes S
i
x
t
W
indows:
Make th
e
pager work
.
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2008-06-26
Johann
e
s
Sixt
When i
n
stalling, be p
r
epared th
a
t tem
p
late_dir
may
.
.
.
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2008-06-26
Johannes
S
ixt
Wind
o
ws: Use a relative default t
e
mplate_
d
ir
a
nd ETC_GITCONFIG
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2008-06-26
Johannes Sixt
W
i
nd
o
ws:
C
ompute the fa
l
lback for exec_path fro
m
the
.
.
.
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2008-06-26
Johan
n
es S
i
xt
T
urn builti
n
_exec_path int
o
a
function
.
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2008-06-26
Johannes Sixt
Win
d
o
w
s
:
Us
e
a customize
d
str
u
ct stat that also has
.
.
.
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2008-06-26
Johan
n
e
s
Sixt
W
indows: Add a c
u
stom im
p
lementat
i
o
n for u
t
ime()
.
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2008-06-26
Johannes
S
ixt
Windows:
I
mplement a cust
o
m spawn
v
e()
.
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2008-06-26
J
o
hannes Sixt
W
indo
w
s: Implement wrap
p
ers for ge
t
hostbyname
(
), socket
.
.
.
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2008-06-26
Johannes Sixt
Windows: W
o
rk around incompatible sort and f
i
nd
.
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2008-06-26
Johann
e
s Six
t
Windows: I
m
p
l
e
ment asynchronous
functions as
t
hreads
.
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2008-06-26
Joh
a
nnes
Sixt
W
indows: Disambiguate
D
O
S
style paths
from
S
SH
URLs
.
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2008-06-26
Johannes Sixt
Windows: A rudi
m
entary poll() em
u
lation
.
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
2008-06-23
J
ohann
e
s Sixt
Wind
o
ws
:
Implement start_command()
.
Signed-off-by:
Johannes Sixt
<johannes.sixt@telecom.at>
commit
|
commitdiff
|
tree
next