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
sha1_file: add raw_object_store argument to alt_odb_usable
2018-03-26
Stefa
n
B
e
l
ler
sha
1
_
f
i
le
:
add raw_obje
c
t_store a
r
g
ument to
alt_odb_usab
l
e
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2018-03-26
Ste
f
a
n
Beller
p
ack: move approximate
obj
e
ct co
u
nt t
o
ob
j
ect store
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2018-03-26
Stefan Beller
p
a
ck:
m
ove prepare_packed_g
i
t_r
u
n_once
to ob
j
ect s
t
o
r
e
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2018-03-26
Stefan Beller
o
b
ject-store: c
l
ose
a
ll pa
c
ks upo
n
clea
r
ing the obje
c
t
.
.
.
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2018-03-26
Stefan
Beller
object-store: m
o
ve packed_gi
t
a
n
d packed_git_mru to
.
.
.
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2018-03-23
Stef
a
n Beller
o
bjec
t
-store: fre
e
a
l
t
_
odb_list
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2018-03-23
St
e
fa
n
Beller
o
bject
-
store
:
move
a
lt_odb_list and
a
l
t
_odb_
t
a
il to
.
.
.
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2018-03-23
Stefan
Beller
ob
j
ect-store:
m
i
grate alternat
e
s struct
and
f
u
n
c
tions
.
.
.
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2018-03-23
Stefan Beller
repository: introduce raw ob
j
ect sto
r
e f
i
eld
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2018-01-05
Stefan Beller
su
b
module: submodule_m
o
ve_head omits
o
l
d a
r
gume
n
t in
.
.
.
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2018-01-05
Stefan B
e
lle
r
unpack-trees
:
oneway_merge to update subm
o
dules
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2018-01-05
S
t
ef
a
n
Beller
t/lib-submod
u
le-update
.
sh: fix
t
es
t
ig
n
oring
i
gnored
.
.
.
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2018-01-05
S
t
e
f
a
n Beller
t/lib
-
s
ubmodule-up
d
a
te
.
sh: clarify t
e
s
t
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2018-01-04
Stefan Bell
e
r
di
f
f: use HAS_MULTI_BITS instead of c
o
untin
g
bit
s
m
anuall
y
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2018-01-04
S
t
e
fan Beller
di
f
f
:
p
r
oper
l
y error out when combining multiple
p
i
ckaxe
.
.
.
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2018-01-04
Stefan Beller
diffc
o
re: a
d
d a
p
i
c
k
axe option to find a
specific blob
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2018-01-04
St
e
fan Beller
diff: introduce DIFF_PICKA
X
E
_KINDS_MASK
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2018-01-04
Stefan Beller
d
i
ff: migrate diff_flag
s
.
pi
c
kaxe_ignore_case to
a
pickaxe_op
.
.
.
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2018-01-04
Stefan Bell
e
r
diff
.
h: make p
i
ckaxe_
o
pts
a
n
u
n
si
g
n
e
d
bit
field
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-12-22
Stefan Beller
t/helper/test-lazy-name-hash
:
f
ix compilatio
n
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-12-19
St
e
fan Bel
l
er
bu
i
ltin/describe
.
c: describe a blob
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-12-12
S
t
efan Beller
t/hel
p
er: ignore
e
v
e
rything
b
ut sourc
e
s
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-12-05
S
t
efan Be
l
le
r
Docum
e
ntation
/
git-clone: impr
o
ve d
e
s
cr
i
p
tion for submodul
e
.
.
.
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-11-16
S
tefan Bell
e
r
bu
i
ltin/
d
escribe
.
c: fact
o
r
o
ut desc
r
ibe_com
m
it
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-11-16
Stefan Beller
bu
i
ltin/describe
.
c: print
d
e
bug
s
t
a
tements
e
ar
l
ier
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-11-16
St
e
fa
n
B
eller
builtin
/
describe
.
c: rename `oid
`
to
avoid variable
.
.
.
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-11-16
S
t
efa
n
Bel
l
er
revision
.
h: introduce blo
b
/t
r
ee wa
l
king in
o
rder of
.
.
.
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-11-12
Stefan Beller
t/35
1
2: de
m
o
n
s
tra
t
e unrelated submodule/f
i
le conflict
.
.
.
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-11-06
Stefan Beller
co
n
fig:
document b
l
ame configuration
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-11-03
Stef
a
n Beller
list-objects
.
c:
f
actor out t
r
ave
r
se
_
t
rees_and_bl
o
b
s
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-11-03
Stef
a
n Bel
l
er
t612
0
:
fix typo in
test n
a
m
e
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-10-26
Stefa
n
Beller
diff
.
c: get rid of
d
uplicate imple
m
entation
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-10-26
St
e
fan Belle
r
x
diff-in
t
er
f
ace:
e
xport comparin
g
and hashing
s
trings
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-10-07
Stefan Beller
tests: fix diff ord
e
r ar
g
uments in te
s
t_cmp
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-10-04
S
tefan Beller
b
r
anch: rese
t
i
ns
t
ead of release a strbuf
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-09-28
Ste
f
an Beller
sub
m
odule:
c
orrec
t
e
r
ro
r
message for m
i
ssing commit
s
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-09-28
Stefan Beller
diff: correct newline
in s
u
mmary for renamed files
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-09-27
Stefan Beller
t7406: submodule
.
<name>
.
upd
a
te command
m
ust n
o
t
be
.
.
.
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-09-24
Ste
f
an
Beller
Doc
u
m
e
n
ta
t
ion/conf
i
g: clarify the meaning of submodule
.
.
.
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-09-22
Stef
a
n
Beller
Documen
t
at
i
on/
g
ithooks
:
mention
m
erge
in
c
o
m
m
it-ms
g
.
.
.
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-09-14
S
tefa
n
Beller
r
e
place-objects: eva
l
uate replacemen
t
refs without
.
.
.
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-09-14
Stefan
B
eller
p
u
sh
,
fetch:
e
r
ror o
u
t for submodul
e
entries n
o
t poin
t
ing
.
.
.
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-09-08
Stefan Beller
builtin/me
r
ge: ho
n
or comm
i
t-msg hoo
k
for merges
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-08-17
Stef
a
n
Bell
e
r
submodule
.
s
h
: remove unused variable
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-08-15
S
t
ef
a
n Beller
sha1_fil
e
: make rea
d
_inf
o
_alternates static
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-08-10
S
t
efan Bel
l
e
r
t1200:
r
e
m
o
v
e
t1200-
t
utoria
l
.
sh
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-07-28
Stefan
Beller
Documentation/check
o
ut: clarif
y
submodul
e
HEADs
to
.
.
.
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-07-26
Stefan Beller
t800
8
:
r
e
l
y on rev-
p
arse'd HEAD instead of sha1
v
al
u
e
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-07-25
Stefan Beller
recursive s
u
bmodules: detac
h
HEAD from
n
ew
stat
e
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-07-13
Stefan
B
eller
t
a
g: c
o
n
v
e
rt
g
p
g
_verify_tag
t
o u
s
e struct
object
_
id
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-07-13
S
tefan
Beller
c
o
m
mit: c
o
nvert lookup_commit_
g
raft to struct object_id
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-07-05
St
e
fan
B
eller
t
/
he
l
per/test-ha
s
hmap: use custom
data inste
a
d
of dup
l
icate
.
.
.
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-07-05
Stef
a
n Beller
name-h
a
sh
.
c
:
drop hashmap_cmp_fn cast
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-07-05
Stefan B
e
ller
submodu
l
e-
c
onfi
g
.
c: drop
has
h
map_cmp
_
fn
ca
s
t
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-07-05
St
e
fan Beller
re
m
ote
.
c: drop hashmap_cmp_
f
n cast
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-07-05
S
te
f
a
n Beller
pat
c
h-
i
ds
.
c: drop hashmap_cmp_fn cast
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-07-05
Stefan B
e
ller
convert/sub-proc
e
ss: drop
c
a
st
t
o hashmap_
c
mp_fn
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-07-05
Stef
a
n
Beller
config
.
c:
dr
o
p
h
ashma
p
_cmp_fn cast
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-07-05
Stefan Beller
buil
t
in/descri
b
e: drop
h
a
s
hmap_cmp_fn
cast
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-07-05
S
t
efan Beller
builtin/difftool
.
c: drop
h
ashmap_cmp_f
n
cast
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-07-05
Ste
f
an Be
l
ler
attr
.
c: drop h
a
shmap_cmp_fn
cas
t
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-30
St
e
fan Beller
d
i
ff:
d
o
cument t
h
e new --color
-
moved settin
g
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-30
Stefan B
e
ller
d
i
ff
.
c: add dimming to moved li
n
e
d
ete
c
tion
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-30
Stefan Beller
d
iff
.
c
:
color mo
v
ed lines differently, plain mode
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-30
Stef
a
n Beller
diff
.
c: color
m
oved line
s
differe
n
tly
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-30
Stef
a
n
B
e
l
l
e
r
diff
.
c: buff
e
r all outpu
t
if
a
s
ked to
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-30
Stefan B
e
ller
d
iff
.
c: emit_di
f
f_s
y
m
b
o
l learns about DIFF_SYMBOL_SU
M
MARY
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-30
Stefan Beller
d
iff
.
c: emit_dif
f
_symbol
l
earns about D
I
FF_SYMBOL_STAT_SE
P
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-30
Stefa
n
Be
l
ler
diff
.
c: convert word diffing to use e
m
it_diff_symbol
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-30
Ste
f
an Beller
diff
.
c: con
v
e
rt sho
w
_st
a
ts to use emit_diff_symbol
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-30
St
e
fan B
e
lle
r
diff
.
c: conv
e
rt e
m
i
t
_binary
_
diff_body to use em
i
t
_diff_symbol
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-30
Stefan
Be
l
ler
submo
d
ule
.
c: migrate d
i
ff output to us
e
emi
t
_diff_
s
ymb
o
l
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-30
S
t
e
f
an Bell
e
r
d
iff
.
c: em
i
t_d
i
f
f
_s
y
mbol learns
DIFF_SYMBOL_REWRITE_D
I
FF
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-30
Stefan Beller
diff
.
c: emit_
d
iff_symbol learns abo
u
t DIFF_SYMBOL_
B
INARY_FILE
S
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-30
Stefan Beller
diff
.
c
:
e
mit_diff_symbol learns DIF
F
_SYMBOL_HEADER
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-30
Stefan Beller
d
i
ff
.
c
: emit_diff_symbol learns DIFF_SY
M
BOL
_
FILEPAIR_
.
.
.
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-30
Stef
a
n Bel
l
er
diff
.
c:
emit_
d
if
f
_sy
m
bol
l
earns
D
IFF_SYMBOL_CONT
E
X
T
_INCO
M
P
L
E
T
E
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-30
Stefan Beller
diff
.
c: emit_d
i
ff_symbol le
a
rns DIFF_SYMBOL_W
O
RDS[_P
O
RCELAIN]
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-30
Stefa
n
Beller
diff
.
c: mi
g
rate emit_line_checked to
u
se emit_d
i
ff_symb
o
l
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-30
Stefan Beller
diff
.
c: emit_
d
iff_sym
b
ol l
e
arns D
I
F
F_SYMBOL_NO_LF_EOF
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-30
Stef
a
n B
e
l
l
e
r
diff
.
c: emit_diff_symbol learns DIFF_SYMBOL_
C
ONTEXT_FRA
G
I
NFO
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-30
Stefan Beller
diff
.
c: emit_d
i
ff
_
sy
m
bol learns DIFF_
S
YMBOL_CONTEXT_
M
ARKER
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-30
St
e
fan Beller
diff
.
c: i
n
troduce emi
t
_di
f
f_symbol
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-30
Stefan Beller
diff
.
c:
factor ou
t
diff_flush_patch_a
l
l
_file_pairs
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-30
Stefan Bel
l
er
diff
.
c: move line end
i
n
g
chec
k
into e
m
it_hunk_header
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-30
Stefan Beller
diff
.
c: r
e
a
dabilit
y
fix
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-30
Stef
a
n Beller
hashmap: migrate document
a
tio
n
from D
o
cumentat
i
on/t
e
chn
i
cal
.
.
.
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-30
S
t
e
fan Belle
r
patch-ids
.
c: use hashmap correctly
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-30
Stefan
Beller
hashmap
.
h: co
m
pare
function has access t
o
a data field
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-30
S
tefan Beller
me
r
ge-rec
u
rs
i
ve: use
DIFF_XDL_
S
ET mac
r
o
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-27
Stefan Beller
builtin/fetch cleanup
:
always set
defaul
t
v
a
l
u
e for
.
.
.
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-23
S
tefan Bell
e
r
p
ull: optionally rebase sub
m
odules (remote su
b
m
o
dul
e
.
.
.
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-23
Stefan Belle
r
b
uiltin/
f
e
t
c
h: par
s
e recurse-
s
u
b
modules-de
f
au
l
t
a
t
.
.
.
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-23
S
t
efan
B
eller
built
i
n/fetch:
f
actor submodule
recurse parsing
o
ut
.
.
.
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-22
St
e
fan Beller
submo
d
u
les: overha
u
l
documentatio
n
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-09
S
tefa
n
Beller
t400
5
:
mo
d
ernize sty
l
e a
n
d drop hard coded sha1
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-04
Stefan
B
eller
Documentation/git-rm: c
o
rrect submo
d
ule description
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-01
Stefan Bell
e
r
b
u
iltin/fe
t
c
h
.
c: respect 'sub
m
odule
.
re
c
urse' option
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-01
Stefan Beller
builtin/push
.
c: respect 'submodule
.
r
ecurse' opti
o
n
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
2017-06-01
Stefan Beller
bu
i
ltin
/
grep
.
c:
respect 'submod
u
l
e
.
recurs
e
' option
Signed-off-by:
Stefan Beller
<sbeller@google.com>
commit
|
commitdiff
|
tree
next