repo.or.cz
/
alt-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Reallow git-rebase --interactive --continue if commit is unnecessary
2007-12-20
Shawn O
.
Pearce
Reallow git-rebase --interactive --con
t
inue if commit
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-12-20
Shawn O
.
Pearce
Ca
t
ch an
d
handle git-commi
t
f
a
ilure
s
in git-rebase
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-12-20
Shawn O
.
Pearc
e
Avoi
d
up
d
at
e
hook during
g
it-
r
ebase --int
e
r
activ
e
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-11-28
S
h
a
w
n O
.
Pearc
e
Remove git-status fr
o
m list of scripts as it is
bui
l
tin
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-11-21
S
h
awn O
.
Pearce
g
it-gui 0
.
9
.
0
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-11-18
Sh
a
w
n
O
.
P
earc
e
Fix
w
arnin
g
about
bitfie
l
d
i
n struct ref
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-11-14
Sh
a
w
n
O
.
Pearce
H
a
ndle b
r
o
k
en
vsn
p
rint
f
i
m
pleme
n
tations
in
s
trbuf
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-11-14
Sha
w
n O
.
Pearce
Don't a
l
low
fast
-
import tree del
t
a chains to exceed
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-11-12
Shawn O
.
P
ear
c
e
git
-
f
e
t
c
h
:
avoid
l
ocal
fe
t
c
h
ing from alterna
t
e (again)
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-11-12
Sha
w
n O
.
Pearce
rev-l
i
st: I
n
trodu
c
e
-
-
quiet to avoid /dev/null redirects
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-11-12
Shawn
O
.
P
ear
c
e
r
u
n-command:
Support sending stderr t
o
/dev/null
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-11-12
Shawn
O
.
P
earc
e
gi
t
-fetch: Always fetch tags if the object th
e
y ref
e
rence
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-11-10
Shawn
O
.
Pearce
Fix memory leak in
t
raverse_commit
_
list
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-11-08
Shawn O
.
Pear
c
e
git
-
gui
:
Bind Meta-T for "Stage To
C
ommit" menu action
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-11-07
Sha
w
n O
.
P
earce
Reteach
b
u
i
ltin-ls-re
m
ote to
u
nderstand remotes
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-11-01
Shawn O
.
Pearce
git-gui: Allow
users
t
o se
t
f
o
nt weig
h
ts to bold
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-10-26
Shawn O
.
Pe
a
r
ce
g
it
-
gui: Prot
e
ct against bad translati
o
n st
r
ings
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-10-23
Shawn O
.
Pearc
e
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-10-23
Shawn O
.
Pearce
git-gui: Make sure we
ge
t
errors from git-up
d
ate-index
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-10-21
Shawn O
.
Pearce
Use PRIuMAX inste
a
d of '
u
nsigned long
long' in show
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-10-21
S
h
awn O
.
Pearce
Merge branch
'
m
a
int
'
commit
|
commitdiff
|
tree
2007-10-21
Shawn O
.
Pearce
Describe m
o
re 1
.
5
.
3
.
5 fixes
i
n
release notes
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-10-21
S
h
awn O
.
Pea
r
c
e
Impr
o
v
ed const corr
e
ctness for s
t
r
ings
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-10-21
S
h
awn O
.
Pearce
M
erge git://git
.
kernel
.
org
/
pub/s
c
m/gitk/gitk
commit
|
commitdiff
|
tree
2007-10-21
Shawn O
.
Pearce
Merge branch 'mai
n
t'
o
f git:/
/
r
ep
o
.
or
.
c
z/git-
g
ui in
t
o
.
.
.
commit
|
commitdiff
|
tree
2007-10-21
Shaw
n
O
.
Pearce
Define compat
v
ersion of mkdte
m
p
for systems l
a
cking
it
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-10-21
S
h
aw
n
O
.
Pearce
M
e
r
g
e br
a
nc
h
'maint'
commit
|
commitdiff
|
tree
2007-10-21
Shawn O
.
Pearce
git
-
gui
:
D
o
n't
d
isplay CR within co
n
sole windows
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-10-21
Shawn
O
.
Pearce
git-gui: Handle pro
g
r
e
s
s
ba
r
s from
newer gits
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-10-20
Shawn
O
.
Pearce
git-
g
u
i: Correct
l
y
report fai
l
ures f
r
om
git-wr
i
te-tree
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-10-19
Shawn O
.
P
e
arce
Avoid s
c
ary
e
rrors abou
t
tagged tree
s
/b
l
obs during
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-10-19
S
h
awn O
.
Pearce
Me
r
ge
b
ranc
h
'mai
n
t'
commit
|
commitdiff
|
tree
2007-10-19
Sh
a
wn O
.
Pea
r
ce
Pa
p
er ba
g
fi
x
d
iff in
v
o
cation in
'
git
s
t
a
sh show'
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-10-19
Shawn O
.
Pearce
Merge branch
'mai
n
t'
commit
|
commitdiff
|
tree
2007-10-19
S
h
awn
O
.
Pearce
Fu
r
ther 1
.
5
.
3
.
5 fixes desc
r
i
bed i
n
rele
a
s
e notes
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-10-19
Shawn O
.
Pearce
Stop displayi
n
g "
P
ack pack-$ID create
d
.
" during git-gc
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-10-19
Shawn O
.
P
e
a
r
c
e
Teach prune-pack
e
d to use the
s
tandard p
r
ogress m
e
te
r
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-10-19
S
h
awn
O
.
Pearce
Ch
a
nge 'Deltifying objects' to 'Co
m
pressing objects'
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-10-19
Shawn O
.
Pe
a
rce
Avoid invoking diff
d
river
s
d
u
ring git-stash
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-10-18
Shawn
O
.
P
ea
r
ce
Merge br
a
nch 'jc/am-qui
e
t
'
commit
|
commitdiff
|
tree
2007-10-18
S
haw
n
O
.
Pear
c
e
Merg
e
bran
c
h
'maint'
commit
|
commitdiff
|
tree
2007-10-18
S
h
awn O
.
Pearc
e
Yet more 1
.
5
.
3
.
5
fi
x
e
s
mentio
n
ed i
n
release notes
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-10-18
Shawn O
.
Pea
r
ce
M
e
rge branch 'lt/di
f
f-rename'
commit
|
commitdiff
|
tree
2007-10-17
S
h
a
w
n O
.
Pearc
e
git-
g
ui: Paper bag fix the global config
pars
i
ng
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-10-17
S
hawn O
.
Pearce
Merge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-10-17
Shawn O
.
Pearce
Docum
e
nt
addi
t
io
n
al 1
.
5
.
3
.
5
fi
x
es in releas
e
notes
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-10-17
Shawn O
.
Pea
r
c
e
Avo
i
d 'expr in
d
ex
'
o
n Mac OS X a
s
it isn
'
t supported
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-10-17
S
h
a
wn O
.
Pearce
Correct typos
i
n releas
e
notes for 1
.
5
.
3
.
5
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-10-16
Shawn O
.
Pearce
Su
p
port 'push --dry-run' f
o
r
h
t
t
p tr
a
nsport
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-10-16
S
h
a
w
n
O
.
Pearce
Sup
p
o
r
t 'push --dry-run' for rsy
n
c
transpo
r
t
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-10-16
Shawn O
.
Pearce
Fix 'push --all branch
.
.
.
' error handling
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-10-16
Shaw
n
O
.
Pe
a
rce
Merge branc
h
'master'
i
nt
o
d
b
/fetch-pack
commit
|
commitdiff
|
tree
2007-10-16
Shawn O
.
P
e
arce
Me
r
ge b
r
an
c
h
'maint'
commit
|
commitdiff
|
tree
2007-10-16
Sh
a
wn O
.
Pearc
e
W
h
ip
post 1
.
5
.
3
.
4 maintenan
c
e
series i
n
to shape
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-10-14
Shaw
n
O
.
Pear
c
e
gi
t
-gui: Hono
r
a config
.
mak in
g
it-gui's top leve
l
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-10-13
Shawn O
.
Pe
a
rce
git-gui:
Collapse $env(
H
O
ME) to ~/ in recent repositories
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-10-13
Shawn O
.
Pearce
git-gu
i
: Suppo
r
t cloning Cygwin b
a
sed
w
ork-dirs
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-10-13
S
h
awn O
.
Pearce
g
i
t
-
gui: Use
p
roper Windows sho
r
tcut
s
instead
of b
a
t
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-10-13
Shawn O
.
Pear
c
e
git-gui: Ensure
c
opy
r
i
gh
t
m
e
ssage
is correctly read
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-10-13
Shawn O
.
P
e
ar
c
e
g
it-gui: Bind n/c/o acce
l
erator
s
in re
p
osi
t
o
r
y
choo
s
er
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-10-13
S
haw
n
O
.
Pearce
git-gui: Disable t
h
e text
w
i
d
g
e
t
in the repository
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-10-13
S
h
awn
O
.
Pearc
e
git-gui: Fix bind errors
w
h
en switching reposit
o
r
y
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-10-12
S
h
awn O
.
Pearce
git-
g
ui: Offer reposi
t
ory management feature
s
in menu bar
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-10-12
Shaw
n
O
.
P
earce
g
i
t
-
gui
:
C
h
ang
e
r
e
p
o
sitory br
o
wser radi
o
butt
o
ns to
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-10-12
S
h
awn O
.
Pearce
git-gui: S
u
pport
L
Fs embedded in conf
i
g file val
u
es
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-10-12
Shawn O
.
P
e
arce
git-
g
u
i
: Refactor git-c
o
n
f
ig
--l
i
st
par
s
ing
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-10-12
Sha
w
n O
.
Pearce
git-
g
ui: Move lo
a
d
_
c
onf
i
g pro
c
edure below git-v
e
rsion
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-10-10
Shawn
O
.
Pearce
git-gui
:
Updated po strings bas
e
d on current s
o
urces
commit
|
commitdiff
|
tree
2007-10-10
S
h
awn O
.
Pe
a
rce
M
e
rge
br
a
nch
'
c
s/d
e
'
commit
|
commitdiff
|
tree
2007-10-10
S
hawn O
.
P
e
arce
g
i
t-gui: Shorten t
h
e staged/u
n
staged
c
hanges title
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-10-10
S
h
awn O
.
Pea
r
ce
git-gu
i
: B
i
nd Cmd-, to
P
referenc
e
s
o
n Mac OS X
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-10-10
Shaw
n
O
.
Pearce
g
i
t-gui
:
Consolidate the Fe
t
ch
a
n
d Push menus i
n
to
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-10-10
Sh
a
wn
O
.
Pea
r
ce
git-gui: Use pr
o
gress m
e
ter in the
s
tatus ba
r
dur
i
ng
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-10-10
Shawn O
.
Pea
r
ce
git-
g
ui: Incl
u
de our Git l
o
g
o in
the abo
u
t
dialog
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-10-10
Shawn O
.
P
e
arce
git-gui: R
e
factor abou
t
dialog code in
t
o its own module
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-10-10
Shawn
O
.
Pearce
git-gui: Refactor Henrik Nyh
'
s logo
int
o
it
s
own procedur
e
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-10-10
Shawn O
.
Pearce
M
erge branch '
m
a
i
nt'
commit
|
commitdiff
|
tree
2007-10-03
Shawn O
.
Pe
a
rc
e
git
-
gui: A
l
low forced pu
s
h into
remot
e
r
epository
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-10-03
Sha
w
n O
.
Pearce
M
erge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2007-10-03
Shawn O
.
Pearce
g
i
t-
g
ui: Don'
t
c
r
ash when starting gitk from a bro
w
ser
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-10-03
S
hawn O
.
Pea
r
ce
g
i
t-
g
u
i:
Allow gitk to be st
a
rted on Cy
g
win with n
a
tive
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-09-28
Sh
a
wn O
.
P
e
arce
git-gui: Refer to our
s
elves
a
s "Git Gui
"
an
d
no
t
"
git
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-09-28
Shawn O
.
Pea
r
ce
git
-
g
u
i: Support a native
M
ac OS
X appli
c
ation bundle
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-09-28
Shawn O
.
Pearce
git-
g
ui: Use Henrik Nyh's git logo icon
on
W
indows
.
.
.
commit
|
commitdiff
|
tree
2007-09-26
S
hawn O
.
Pearce
git-gui: Make the status bar easier to rea
d
in the
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-09-26
Shaw
n
O
.
P
e
arce
git-gu
i
:
S
witc
h
th
e
git-gui logo to He
n
rik Nyh's
l
ogo
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-09-26
Sh
a
w
n
O
.
P
e
arce
git-gui: Do
n
't delete sc
r
o
l
l
bars in
console win
d
o
ws
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-09-26
Shawn O
.
P
earce
git-gui
:
Don't del
e
te
c
o
n
s
o
l
e window nam
e
s
paces t
o
o
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-09-25
Sh
a
wn O
.
Pearce
Preve
n
t send-pack from segfaulting
when a branch
d
oesn
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-09-25
Shawn O
.
Pearce
Cleanup unne
c
essary break
i
n
rem
o
te
.
c
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-09-25
Shawn O
.
Pearce
Cle
a
nup styl
e
n
i
t
of 'x == N
U
LL' in remote
.
c
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-09-25
Sh
a
wn O
.
P
e
arce
git-g
u
i: Copy ob
j
ects
/
info
/
alterna
t
es duri
n
g
s
tandard
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-09-25
Shawn
O
.
Pearce
git-
g
ui: Keep
t
he U
I
r
esponsive whi
l
e co
u
n
t
ing o
b
j
e
c
ts
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-09-25
Shawn
O
.
Pearce
gi
t
-gui: Don't bot
h
er
s
h
o
wing OS er
r
or message about
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-09-23
Shawn O
.
Pe
a
rce
git
-
gui: Avoid co
n
s
ol
e
scr
o
llbars unle
s
s
they are nece
s
s
a
ry
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-09-23
Shawn
O
.
P
ear
c
e
git-gui: Al
l
ow users t
o
cho
o
se/create/c
l
one a repository
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-09-22
Shawn O
.
Pearce
git-
g
ui: Refactor some UI init to o
c
cu
r
earlier
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-09-22
Shawn O
.
Pearc
e
Merge branch 'main
t
'
commit
|
commitdiff
|
tree
2007-09-22
Shawn O
.
P
e
a
rc
e
git-
g
ui
:
Ens
u
r
e
.
git/
i
nfo/exclude is hon
o
r
e
d
in
Cygwin
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-09-22
Shawn O
.
Pe
a
rce
git-gui:
Handle s
t
ar
t
ing on mapped shares un
d
er
C
y
gwin
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
next