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
setup.h: move declarations for setup.c functions from cache.h
2023-03-21
E
l
ijah Newren
set
u
p
.
h
: mov
e
declarations
f
or set
u
p
.
c func
t
ions from
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2023-03-21
Elija
h
N
ewr
e
n
treewid
e
: remove cache
.
h inclusion du
e
to environment
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2023-03-21
Elijah Newren
environ
m
e
n
t
.
h: move declar
a
tio
n
s
fo
r
en
v
ironment
.
c
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2023-03-21
Elijah N
e
wre
n
t
reewide: remove unnecessary includes of c
a
c
h
e
.
h
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2023-03-21
E
l
i
jah Newren
wrap
p
er
.
h: mov
e
declara
t
i
o
ns
f
o
r
wr
a
ppe
r
.
c
f
un
c
tion
s
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2023-03-21
E
lijah Newren
p
a
th
.
h
:
m
ove f
u
n
ct
i
o
n
d
eclarations for path
.
c f
u
n
c
t
i
ons
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2023-03-21
Elijah New
r
en
cache
.
h: remov
e
ex
p
a
nd_
u
ser_path()
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2023-03-21
Elijah Newren
a
bspat
h
.
h: move absolute path functions
f
rom
cache
.
h
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2023-03-21
Elijah Newren
e
nvironment:
move
comment_l
i
ne
_
char fro
m
cach
e
.
h
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2023-03-21
Elijah New
r
en
treewid
e
:
r
emove unnece
s
s
ary cache
.
h in
c
l
usio
n
from
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2023-03-21
Elijah Newren
tr
e
ewi
d
e: remove
unnecessary
i
nclus
i
on
of
ge
t
text
.
h
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2023-03-21
Elijah
N
ewr
e
n
tree
w
ide:
b
e explicit about
de
p
endence
o
n
gett
e
xt
.
h
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2023-03-21
Elij
a
h Newren
treewide: remove unnecessary c
a
ch
e
.
h inclusion from
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2023-02-27
Elijah Newren
unpac
k
-t
r
ees: add usage
n
otices a
r
ound
d
f_conflict_entry
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2023-02-27
Elijah
Newren
unp
a
ck-tr
e
es
:
special case read-tree de
b
uggin
g
as inter
n
a
l
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2023-02-27
Elijah Newren
unpack-tr
e
es: rewrap a few
o
ver
l
o
n
g
l
ines f
r
om
p
revious
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2023-02-27
Elija
h
New
r
en
unpack-trees: mark fields onl
y
used internally as
inte
r
nal
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2023-02-27
Elija
h
Newren
u
n
pack_tree
s
: star
t
splitti
n
g internal fields from
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2023-02-27
E
l
i
j
ah Ne
w
r
en
s
p
a
r
se-checkou
t
: av
o
id using inter
n
al API o
f
unpack
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2023-02-27
Elijah Newren
sparse-checkout: a
v
oid u
s
i
n
g i
n
ter
n
a
l A
P
I o
f
unpack
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2023-02-27
E
l
ijah
N
ewr
e
n
u
npack-
t
rees: clean
u
p
s
ome flow control
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2023-02-27
Elijah
N
e
wren
dir: mark outpu
t
only fiel
d
s of
d
ir
_
struct as
s
u
ch
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2023-02-27
Eli
j
ah Newr
e
n
d
i
r: add a usage note to ex
c
lude_pe
r
_dir
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2023-02-27
Elijah Newren
dir: separate
publi
c
f
r
om internal porti
o
n
o
f dir
_
stru
c
t
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2023-02-27
Elijah Newren
unpack-trees: hee
d
re
q
ues
t
s to overwrite ignored
f
iles
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2023-02-27
E
l
ij
a
h
Newre
n
t2021:
fix plat
f
orm-specific leftover cruft
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2023-02-24
Elijah
Newren
di
f
f
.
h: re
m
ove u
n
n
ecessary include of
obj
e
ct
.
h
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2023-02-24
E
lijah Newr
e
n
Remo
v
e
unnecessary in
c
ludes of
builtin
.
h
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2023-02-24
E
lijah Newren
t
reewi
d
e: re
p
lace
cache
.
h wi
t
h m
o
re
d
irect h
e
ader
s
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2023-02-24
Elijah Newren
replace
-
o
bject
.
h
: move read_replace_refs declar
a
ti
o
n
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2023-02-24
Elijah New
r
en
o
b
ject
-
store
.
h
:
move struct
o
bject_info
fr
o
m cac
h
e
.
h
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2023-02-24
Elijah Newren
dir
.
h
:
refa
c
tor t
o
no
longe
r
need to include cache
.
h
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2023-02-24
Elijah Newren
ob
j
ect
.
h: stop dependi
n
g
o
n cache
.
h; mak
e
c
ache
.
h dep
e
n
d
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2023-02-24
E
l
ijah Newren
ident
.
h: move ident-related declarations out o
f
cache
.
h
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2023-02-24
E
lijah Newren
p
r
etty
.
h
:
m
ove has
_
non_ascii() de
c
l
a
rat
i
on from comm
i
t
.
h
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2023-02-24
Elijah N
e
wre
n
cach
e
.
h:
r
emove
d
epende
n
c
e on hex
.
h;
m
a
ke other files
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2023-02-24
El
i
jah Ne
w
ren
hex
.
h
:
move some hex
-
r
e
lated decla
r
ations fr
o
m cache
.
h
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2023-02-24
Eli
j
ah
N
ewren
h
ash
.
h: move some
oid-r
e
lated declaration
s
fr
o
m cache
.
h
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2023-02-24
Elijah Newren
alloc
.
h: move ALLOC_GROW() func
t
ions from cache
.
h
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2023-02-24
Eli
j
ah Newren
tree
w
ide: remove
u
nnecessary cache
.
h inclu
d
es
i
n source
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2023-02-24
Elijah
N
ewr
e
n
treewide:
remove unn
e
cessar
y
ca
c
he
.
h includ
e
s
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2023-02-24
Eli
j
ah N
e
wre
n
treewide: remove un
n
eces
s
ary git-com
p
at-util
.
h include
s
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2023-02-24
El
i
jah Newre
n
treew
i
de: ensure one o
f
the appropriate
h
eaders is
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2023-02-09
E
l
ijah
N
ewren
na
m
e
-rev: fix names b
y
drop
p
ing taggerdat
e
workaro
u
nd
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2023-01-25
Elijah
Newren
rebase: provid
e
better er
r
or message
for apply options
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2023-01-25
Elijah Newren
rebase: put rebase_optio
n
s
i
n
it
i
ali
z
ation in single
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2023-01-25
Elij
a
h Newren
rebase: fix formatti
n
g
o
f
rebase --rea
p
ply-che
r
ry
-
picks
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2023-01-25
E
l
i
jah Newren
r
ebase: clarif
y
the OPT
_
CMDMODE in
c
ompatibilities
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2023-01-25
Elijah Newren
rebase: add
coverage of other in
c
ompatible options
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2023-01-25
E
l
ijah Newren
r
e
bas
e
: fix i
n
compatiblity checks
f
or
-
-[no-
]
rea
p
ply
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2023-01-25
E
l
ijah Newre
n
rebase
:
fix docs a
b
out i
n
com
p
atibiliti
e
s with --root
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2023-01-25
E
lijah Newren
rebase: remove --allow-emp
t
y-message from incompatible
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2023-01-25
Elijah
N
e
wren
reb
a
se: flag
--a
p
ply
a
nd --merge
as incom
p
atible
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2023-01-25
E
l
i
j
ah
N
ewren
r
e
b
a
se:
m
ark --update-refs as requiring the
m
e
r
ge backend
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2023-01-15
E
l
ijah Newren
t6426: f
i
x T
O
DO about m
a
k
i
n
g te
s
t
m
ore comprehensive
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2023-01-13
Elijah Newren
ls-
f
iles: guide fol
k
s
t
o --exclude-standard over ot
h
er
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2023-01-13
E
l
ijah Newren
ls-files: cl
a
ri
f
y descriptions of
status tags for -t
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2023-01-13
Eli
j
ah
N
e
w
ren
ls-fi
l
es:
c
larify descrip
t
i
o
ns
o
f
f
ile sel
e
ction
o
pt
i
o
ns
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2023-01-13
El
i
jah Newren
ls-files: add missing d
o
cumentation for
--resolve-undo
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-11-07
El
i
jah Newren
spars
e
-
c
heckout
.
txt: new do
c
ument wit
h
s
parse-
c
heckout
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-10-23
Eli
j
ah Newren
m
er
g
e-tr
e
e:
s
upport
m
ultiple ba
t
c
h
e
d merges with -
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-10-23
Elijah
Newren
merge-tree:
update docume
n
tation for diff
e
ren
c
es
in
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-10-22
Elija
h
Newren
merge-ort:
fix
b
ug w
i
th d
i
r rename vs change dir to
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-09-02
Elijah Newren
dif
f
: fi
x
filtering of
m
erge com
m
it
s
under --remerge
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-09-02
Elijah Ne
w
r
e
n
d
iff: fix filtering of additional headers under --remerge
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-09-02
E
li
j
ah Newren
diff:
h
ave sub
m
o
d
u
l
e
_f
o
rmat
logic avoid addition
a
l
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-08-26
Elijah Newren
t64x
x
: convert 'test_create_repo' to
'git
ini
t
'
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-08-24
Elijah Newren
t4301: add
more interest
i
ng merge-
t
ree testcases
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-08-24
Elijah Newre
n
merge: small
c
o
de readability imp
r
ovemen
t
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-08-24
Elijah
Newren
merge: cleanup confusing logic for
h
and
l
ing successful
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-08-24
Elijah Newre
n
merge: o
n
l
y a
p
ply autost
a
s
h
w
hen
a
pp
r
opriate
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-08-19
Elijah Newr
e
n
revision: a
l
l
o
w
--a
n
cestry-pat
h
to take an argumen
t
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-08-19
Elijah New
r
en
rev-
l
ist-op
t
ions
.
t
x
t: fix simple ty
p
o
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-08-19
Elija
h
Newren
merg
e
-ort: remove cod
e
ob
s
oleted by other c
h
anges
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-08-18
Elijah Newren
m
e
rge-or
t
: provide helpful s
u
b
module u
p
d
ate message
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-08-18
Elijah Newren
merge-ort: avoid surprise with new
s
ub_flag var
i
a
b
le
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-08-18
E
lijah
N
e
wren
merge-ort: remove tr
a
n
s
lator lego in new "s
u
bmodu
l
e
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-07-23
Elijah Newren
merge:
d
o
not
exit restore_stat
e
() prem
a
turely
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-07-23
E
l
ij
a
h
Ne
w
ren
merge: en
s
ure we
can actuall
y
restore
p
re-mer
g
e state
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-07-23
Elij
a
h
New
r
en
me
r
ge: make res
t
ore_state() res
t
ore staged state too
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-07-23
Elijah New
r
en
merge: fix save_s
t
ate() to work when there a
r
e s
t
at
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-07-23
Elijah Newren
merge: do not
abort
e
a
rly
i
f o
n
e strate
g
y fa
i
ls to
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-07-23
Elijah New
r
e
n
merge: abort if index does not m
a
tch H
E
AD
for trivial
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-07-23
Elijah Newre
n
merge
-
resolve: abort if index does not match
HEAD
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-07-23
Elijah Newren
me
r
ge
-
ort-w
r
appers: make p
r
inted
mes
s
age
m
a
tch the
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-07-06
Eli
j
ah Newren
merge-ort:
fi
x
i
s
sue wit
h
d
u
al
rename
a
nd
add/add
c
onflict
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-07-06
Elijah Newr
e
n
merge-ort: shu
f
fle the co
m
putation and cleanup o
f
potential
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-07-06
Elijah Newren
t6423: add t
e
sts of dual
d
irectory
r
ename plus add
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-06-22
Elijah Newren
git-merge
-
tree
.
txt
:
add a sect
i
o
n on
p
o
te
n
t
i
onal usage
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-06-22
Elijah Newren
merge-tree: add a --allo
w
-unrelate
d
-his
t
o
ries f
l
a
g
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-06-22
Elijah Newren
merg
e
-
t
ree
:
allo
w
`l
s
-files -u` style info to
be NUL
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-06-22
Elijah
N
ewren
mer
g
e-or
t
: o
p
tion
a
lly pro
d
uce machine-readab
l
e o
u
tpu
t
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-06-22
Elijah Newr
e
n
merge
-
o
r
t: store more specific conflict
inform
a
tion
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-06-22
E
l
i
j
ah Newren
m
e
rge-tree:
provide easy
a
ccess to
`ls-
f
iles -u`
style
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-06-22
Elijah N
e
wren
merge-tree: provide
a
list of which fi
l
e
s have
c
on
f
licts
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-06-22
Elijah Newren
me
r
ge-ort: rem
o
v
e command-l
i
n
e-centr
i
c submodule me
s
sage
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-06-22
Elijah N
e
wren
m
er
g
e-ort
:
provide a merge_get_
c
o
n
f
licted_
f
iles() h
e
lp
e
r
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-06-22
Elijah Newre
n
merge-tree: sup
p
ort including merge messages in output
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-06-22
Elijah Newr
e
n
merge-ort: split out
a sep
a
r
a
te
d
isplay_update_messages
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-06-22
Elij
a
h
N
e
wren
merge-t
r
ee:
i
mplem
e
nt rea
l
m
e
r
ges
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
next