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
diff: have submodule_format logic avoid additional diff headers
2022-09-02
Elij
a
h Newr
e
n
diff
:
have submodule_
f
ormat log
i
c a
v
o
id additio
n
al
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-08-19
Eli
j
ah N
e
w
ren
revis
i
on:
allow --ancestry-path to take
an argumen
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-08-19
Elijah Newren
rev-list-options
.
tx
t
: f
i
x
simple typo
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-08-19
Elijah
Newren
m
e
r
g
e-ort: r
e
move co
d
e
obsoleted by other chan
g
es
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-08-18
El
i
ja
h
Newren
merge-ort
:
p
r
o
vide helpful submodule upda
t
e message
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-08-18
Elijah Newren
mer
g
e-
o
rt
:
a
void surp
r
ise w
i
th new
sub
_
f
lag variable
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-08-18
Elijah Ne
w
r
e
n
merge-
o
rt: remov
e
t
r
anslator lego in new "sub
m
o
d
ul
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-07-23
Eli
j
ah
N
ewre
n
merge: do not exit restor
e
_
s
tate() prematu
r
ely
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-07-23
Elijah Newren
me
r
ge: en
s
ure we ca
n
a
ctually rest
o
re
pre-
m
erge state
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-07-23
Elijah Newren
m
erge:
m
ake resto
r
e_state(
)
r
esto
r
e staged state too
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-07-23
E
lijah Newren
merge: fi
x
save_sta
t
e(
)
to w
o
rk
when there are stat
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-07-23
E
l
ija
h
Newren
merge: do not abort ear
l
y if one st
r
a
t
e
gy
fails t
o
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-07-23
E
lijah Newren
merge: abort if index
does not match H
E
A
D
for trivial
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-07-23
Elija
h
Newren
merge-r
e
s
o
lve:
a
bort if index does not match HEAD
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-07-23
Elijah Newren
m
erge-ort-wrappers: ma
k
e
p
rinted messag
e
match the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-07-06
Elija
h
N
ewren
merge-ort:
fix i
s
sue with d
u
al rename
a
nd
a
dd/add conflict
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-07-06
Elijah Newren
merge-ort:
s
hu
f
fle the computa
t
i
on and cleanup of potential
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-07-06
Elijah
N
e
w
re
n
merge-ort: make a separ
a
t
e
func
t
ion for freeing
s
truct
.
.
.
Signed-off-by:
Elijah Newren
<newren@palantir.com>
commit
|
commitdiff
|
tree
2022-07-06
Elijah
N
ewren
merge-ort: small cleanu
p
s of check_for_d
i
rectory_rename
Signed-off-by:
Elijah Newren
<newren@palantir.com>
commit
|
commitdiff
|
tree
2022-07-06
Elija
h
Newren
t
6423: add tests of d
u
a
l
directory
r
ena
m
e
plus add
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-07-01
Elijah Newren
t
6429: fix
use o
f
n
o
n
-existent function
Signed-off-by:
Elijah Newren
<newren@palantir.com>
commit
|
commitdiff
|
tree
2022-06-22
El
i
ja
h
Newren
g
i
t-
m
erge-tree
.
txt:
add
a
section on potentional usage
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
Elijah Newren
merge-tree:
add a --allow-unr
e
l
ate
d
-histories fl
a
g
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
Elijah Newren
merge-tree: allow `l
s
-files -u`
s
t
y
l
e info t
o
be N
U
L
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
Elijah Newren
mer
g
e-ort: op
t
ion
a
l
ly produce machine-readable output
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
Eli
j
ah Newr
e
n
merge-ort: sto
r
e more specific con
f
lict inform
a
tion
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
Elijah Newren
merge
-
tree: pr
o
vide easy access to `ls-files -u` style
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
E
l
i
j
a
h Newre
n
merge-tre
e
:
provide a list
of whic
h
files
h
a
v
e
c
o
nflicts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
Elijah Newren
merg
e
-ort: r
e
mo
v
e command
-
line-centric
submodule message
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
Elijah Newre
n
merge
-
ort: provide
a me
r
ge_get_
c
onflicted_files()
helpe
r
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
Elijah N
e
wr
e
n
me
r
ge-t
r
ee: support including m
e
rge m
e
ssages i
n
output
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
Elijah
Newre
n
mer
g
e-ort: s
p
lit out a sep
a
rate display
_
update
_
messages
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
Elij
a
h Newren
me
r
ge
-
tree:
im
p
lement rea
l
merges
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
Elij
a
h Newre
n
mer
g
e-
t
ree: add o
p
tion
parsing and init
i
al shell for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
E
lijah Newren
merge
-
tree: move logic for ex
i
sting m
e
r
ge
into
n
e
w
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
Elijah
New
r
en
me
r
ge
-
t
r
ee: rename
merge_trees() to t
r
ivial_me
r
ge_trees()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-04-22
Elij
a
h Newren
Do
c
umentation: some sp
a
rsity wordin
g
clarificat
i
ons
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-04-22
Elijah Newren
g
it-
s
parse-check
o
ut
.
t
xt: mark non-c
o
ne m
o
de as de
p
re
c
ated
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-04-22
Elijah Newren
g
i
t
-sp
a
rse-checkout
.
txt: flesh out
p
attern set
se
c
tions
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-04-22
Elijah Newren
git-sparse-
c
heckout
.
txt
:
add
a
n
e
w
E
X
A
MPLES s
e
ctio
n
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-04-22
Elijah Newren
git-
s
parse-checkout
.
t
x
t
:
s
huffle
s
o
m
e section
s
and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-04-22
Elijah Ne
w
ren
git-spars
e
-
checkout
.
txt:
u
pdate docs fo
r
d
eprecation
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-04-22
E
l
i
jah Newre
n
git-spars
e
-ch
e
ck
o
ut
.
t
xt:
wordi
n
g upd
a
tes
f
or the cone
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-04-22
Elijah Newren
spars
e
-
checkout: make
--cone the default
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-04-22
El
i
jah Newren
tests: stop
a
ss
u
min
g
--no-co
n
e i
s
the d
e
fa
u
lt mode
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-03-02
Elijah
N
ewren
r
epo_read_index: add co
n
fig to e
x
pect f
i
les outside
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-03-02
E
l
i
j
ah
N
ewren
merge-o
r
t
:
exc
l
ud
e
m
e
s
s
age
s
from inne
r
mer
g
e
s by default
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-20
E
lijah
Newre
n
merge-ort: fix small
m
emory leak
i
n uniqu
e
_pat
h
()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-20
Eli
j
ah Newren
merge-ort: f
i
x smal
l
m
e
m
o
r
y leak
in d
e
tect
_
and_
p
r
ocess_renames
(
)
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-20
Eli
j
a
h
N
ewren
sparse
-
checkout: reject ar
g
u
m
ents in con
e
-mode tha
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-20
Elijah N
e
wren
sparse-ch
e
ckout: erro
r
or warn when given in
d
ividual
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-20
El
i
ja
h
Ne
w
ren
sparse-checkout: pay attention t
o
prefi
x
f
o
r {set,
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-20
Elijah N
e
w
r
en
sparse-checkout:
c
o
rrectly set non-cone mod
e
when expected
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-20
Elijah Newre
n
sp
a
rse-
c
h
eckou
t
: correct reapply
'
s h
a
n
d
ling o
f
options
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-17
E
li
j
ah
N
e
wren
merge-ort: m
a
k
e informational messages
f
rom
r
ecursive
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
Elijah Newren
d
i
ff-merges: avo
i
d
history simplifications w
h
en diffing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
El
i
j
a
h N
e
wren
merge-ort: mark
c
on
f
lict/
w
arning messages from inner
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
Elijah
N
ewre
n
show, log
:
include
c
onflict/
w
arni
n
g messages in --re
m
erge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
El
i
jah Newr
e
n
d
iff: add ab
i
lity to i
n
sert a
d
d
i
tion
a
l headers for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
Elijah N
e
wren
me
r
ge-o
r
t: forma
t
me
s
s
ages
slight
l
y di
f
f
erent for use
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
Elijah N
e
wren
merge-ort: ma
r
k a few mo
r
e conflict messa
g
es
a
s omittab
l
e
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
Eli
j
ah
Newren
m
e
rg
e
-o
r
t: capt
u
re and print ll-merge
w
arnings in our
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
Elijah Newre
n
ll-me
r
ge: make calle
r
s
r
esp
o
ns
i
ble for showing warnings
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
El
i
jah
N
ewren
log: clean
unneeded obje
c
ts dur
i
ng `log
--re
m
erge-di
f
f`
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
Elij
a
h
N
ew
r
en
show,
l
og: provide a --re
m
erge-diff
capability
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
El
i
jah
Newren
repo-
s
ettings: rename th
e
traditional default
fetch
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
Elijah Newren
repo-set
t
i
n
g
s:
fix error ha
n
d
lin
g
f
or unknow
n
values
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
E
l
ijah Newre
n
repo-settings: fix checking for fetch
.
negot
i
ati
o
n
Algori
t
hm
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-01-28
Elijah
N
ewren
sparse-checkout
:
fix a coupl
e
minor memory lea
k
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-01-26
E
lijah Newren
sequencer, stash: fix running f
r
om w
o
rktree subdir
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-01-21
Elija
h
Newren
merge: fix memo
r
y leaks in cmd_
m
erge()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-01-21
Elijah Newren
mer
g
e-ort
:
fix memory l
e
a
k
in merge_ort_internal()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-01-17
E
l
ijah Ne
w
ren
merge-ort:
avo
i
d
a
ssuming
a
ll r
e
names detec
t
ed
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-01-14
Elijah
N
ewre
n
A
ccelerate cle
a
r
_skip
_
worktree_from
_
present_files(
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-01-14
E
l
i
j
ah Newr
e
n
Update documentation
r
ela
t
e
d
t
o
s
p
arsity and the s
k
ip
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-01-14
Elijah Newren
re
p
o_read_index
:
c
lear SKIP_WORKTR
E
E bit fro
m
files
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-01-14
Elijah Newren
un
p
ack-trees:
f
ix accidental loss of user ch
a
nges
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-01-14
El
i
j
a
h Newren
t1011: add testcase de
m
o
nstrating a
c
cidental loss of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-01-04
E
lijah Newren
stash: do not return before res
t
oring u
n
tracke
d
files
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-30
Elij
a
h New
r
en
merge-ort
:
fix bug with
r
enor
m
alization and ren
a
m
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-23
Elijah New
r
en
sparse-checkout: re
m
ove stray trail
i
ng space
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
Elijah
N
e
w
re
n
clone:
a
void usi
n
g
dep
r
eca
t
ed `sparse-checkou
t
init`
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
El
i
jah
Newr
e
n
Documentation: clarify/correct a few sparsity
r
elated
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
Elijah N
e
w
ren
git-sparse
-
checkout
.
t
x
t: update to docu
m
ent
i
n
it/set
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
Elijah Newren
sp
a
rse-chec
k
out: enable
reapply
to take
-
-[no-]
{
cone
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
E
lijah
N
ewr
e
n
sparse-checkou
t
: enable
`set
`
t
o in
i
tializ
e
spars
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
Elijah Ne
w
ren
sp
a
rse-checko
u
t
:
sp
l
i
t o
u
t
code for
t
wea
k
ing settings
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
Elijah Newren
spars
e
-
c
hec
k
ou
t
: disal
l
o
w -
-
no-stdin
a
s a
n
ar
g
ume
n
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
El
i
j
a
h Newren
sparse-checkou
t
: add sanity-checks on in
i
tial sparsi
t
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
E
l
i
ja
h
Ne
w
ren
spar
s
e-checkout: break
apart functi
o
ns fo
r
sparse_checkout_
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
E
l
ijah Newren
sparse
-
checkout: pass use
_
stdin as a parameter instead
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
Elijah N
e
wren
t2501: simplify the tests
sin
c
e we can now assume desired
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
Elija
h
Newren
dir: ne
w
f
lag to
r
emo
v
e_dir_recurse() to spare the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
E
lijah N
e
wr
e
n
d
ir: avoid in
c
ident
a
lly
removi
n
g the o
r
i
g
inal_cwd
in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
Elijah Ne
w
ren
stash: d
o
not attempt to remove startup_
i
n
f
o->ori
g
inal_
c
wd
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
E
l
i
jah Newren
r
e
base: do
n
ot
atte
m
p
t to remove st
a
rtup_info
-
>
original_cwd
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
El
i
jah
N
ewren
clean: do not attem
p
t
to
rem
o
ve startup_info->origin
a
l_cwd
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
Elija
h
Newren
syml
i
nks
:
do
not
i
nclude
startup_info->original_cwd
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
Elijah Newren
u
n
pack-trees:
add special cwd handling
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
Elijah Newr
e
n
unpack-trees: refuse t
o
remove
startup_
i
nfo-
>
original_
c
wd
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next