repo.or.cz
/
git
/
raj.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
fast-import: support 'encoding' commit header
2018-06-27
Elij
a
h
Newren
d
i
rectory-rename-detecti
o
n
.
txt: tech
n
ical doc
s
o
n
abilitie
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elija
h
Newren
git-reba
s
e: mak
e
--allow-
e
m
p
ty-message t
h
e default
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
El
i
jah Newr
e
n
git-reb
a
s
e
.
t
xt
:
address confusion b
e
t
w
een --
n
o
-
ff vs
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Newren
t3401
:
add directory rename testcases for rebas
e
and am
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
E
lij
a
h Newren
git-rebas
e
:
e
r
ror out when incompatible options
pas
s
ed
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Newren
git-rebase
.
txt: docu
m
e
n
t
b
eh
a
vior
a
l differences betwee
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
E
l
ijah Newren
t34
2
2: new testca
s
es for checking
when incom
p
atibl
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-26
Elijah Newre
n
git-reb
a
se
.
sh: upda
t
e help messages
a bi
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-26
E
lijah Newren
g
it-rebase
.
txt: d
o
c
u
ment incompatible
options
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-13
Elijah
N
ewren
R
elNotes 2
.
1
8
: cla
r
ify wher
e
d
irecto
r
y rena
m
e detec
t
ion
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
Eli
j
ah Newre
n
mer
g
e
-
recursive
:
add poi
n
ter
about unduly com
p
lex lo
o
k
i
n
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
El
i
ja
h
Newren
merge-recursive: ren
a
m
e
confl
i
c
t
_
re
n
am
e
_*
(
)
f
a
m
ily
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
Eli
j
ah Newr
e
n
merge
-
recursive: clarify the re
n
ame_dir/RENAME
_
DIR
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
Elijah Newren
merge-rec
u
rsive:
a
lign
labels with their respective
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
Elija
h
N
e
wre
n
merge-r
e
cu
r
sive:
fix nu
m
erou
s
a
rgument alignment issues
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
Elijah Newren
merge-recursive: fix misc
e
llaneo
u
s grammar
e
rror in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-01
Eli
j
ah Newr
e
n
RelNotes: remov
e
dupli
c
at
e
release note
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Elij
a
h New
r
en
t6036: prefer
test_
w
hen_finished to
ma
n
ual c
l
eanup
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Elijah Newren
t
6
036,
t
6042:
p
refer test_
c
mp
to sequ
e
nc
e
s of te
s
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Elijah Newre
n
t6036,
t
6042:
prefe
r
test_path_is_file
,
test_path_is
_
missing
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Elijah Newren
t6036, t
6
042:
u
se
t
est_l
i
ne_count i
n
stead o
f
wc -l
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Eli
j
ah New
r
en
t6036, t604
2
: use test_create_
r
ep
o
to ke
e
p tests i
n
depe
n
dent
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-25
Elijah Newren
rev-parse: check l
o
okup'ed commit r
e
ferences f
o
r
N
ULL
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-20
El
i
jah New
r
en
merge-recursive: provide pair of
`u
n
p
a
ck_tree
s
_
{
sta
r
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newr
e
n
merge-recursive: fix check for skipa
b
il
i
ty of workin
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
lijah Newren
m
erge
-
r
e
cursive:
make "A
u
t
o
-merging" comment show
for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
l
ij
a
h N
e
wren
merge-recursive:
f
ix rem
a
inder of was
_
dirty() to us
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
lijah
Newren
merg
e
-recursive: fix
was
_
tracked() to q
u
it lying
with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
t6
0
46: testcases checking whet
h
er upd
a
t
e
s
c
an be skipped
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-r
e
cursive: avo
i
d trig
g
ering
add_
c
achei
n
fo error
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
l
i
jah
N
ewren
me
r
g
e
-recursive: move more is
_
dirt
y
hand
l
i
ng
to
m
e
rge_content
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
lijah Newre
n
merge-recursiv
e
: impro
v
e add_cacheinfo er
r
or ha
n
dling
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
l
i
ja
h
Ne
w
ren
merge-recursive: avoid s
p
u
ri
o
us re
n
ame/r
e
name conflic
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elija
h
Newren
directory rename detection: n
e
w testcases
s
howcasing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elij
a
h
Newre
n
merge-r
e
cursive: fix remaining director
y
ren
a
me + dir
t
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
me
r
ge-re
c
urs
i
ve: fix overwriting dirty fil
e
s
involved
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merg
e
-recursiv
e
: avoi
d
clo
b
bering untracked files with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newr
e
n
m
e
rge-recurs
i
ve:
a
pply n
e
cessa
r
y
mod
i
ficati
o
ns for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-recursive:
w
hen co
m
paring file
s
, don't incl
u
de
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
me
r
ge-recurs
i
ve: check for f
i
le level con
f
licts th
e
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Ne
w
ren
merg
e
-r
e
cursi
v
e: add computati
o
n of col
l
isions due
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-rec
u
rsive:
c
h
eck for director
y
level conflic
t
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-recursi
v
e
:
a
dd get_directo
r
y
_renames()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-02
E
l
ijah
N
e
w
ren
unpack_trees: fix breakag
e
when o->src_i
n
dex !
=
o-
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-25
Elijah Newren
Make runn
i
ng git un
d
er other debugger-like programs
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
merge
-
recursi
v
e
:
make a helper fun
c
t
ion f
o
r cleanup
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elij
a
h Newren
merge-recursive: split ou
t
code
for determinin
g
d
iff_file
p
airs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
E
l
ija
h
Newren
merge-recursive:
make !o->detect_re
n
ame co
d
epa
t
h
more
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
me
r
ge-r
e
cursive: fix leak
s
of al
l
o
c
ated renames and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
E
l
ijah N
e
wre
n
merge
-
recur
s
ive: introduce new
functions to hand
l
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elij
a
h Newren
mer
g
e-recurs
i
ve
:
move the get_renames() function
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
E
l
ijah Newren
directory rename detection: tests for
handling overwri
t
ing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah
N
ewren
dire
c
tory re
n
ame de
t
ection: tests for handling ove
r
writing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
El
i
jah Newren
d
i
rectory rename detec
t
io
n
: miscell
a
neous t
e
stcas
e
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
E
l
ijah Newren
di
r
e
ctory rename detection
:
testcases ex
p
lorin
g
pos
s
i
b
ly
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah
Newren
dire
c
tory rename dete
c
tion: more involved edge/co
r
ner
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
directory
r
ename de
t
ection: testcase
s
checking wh
i
ch
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah
N
e
wren
directo
r
y rename detectio
n
: files/directories in
the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah N
e
wren
d
irecto
r
y rena
m
e detec
t
ion
:
partially renamed directory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
director
y
rename detection: testcases
t
o avoid taking
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
E
l
ij
a
h Newren
directory
r
ename detection: di
r
ector
y
sp
l
itting testcases
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
direc
t
or
y
rename detec
t
i
o
n
:
b
asic testcases
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-09
E
l
ijah
Newren
Document
a
tion
:
normalize spelling
o
f 'nor
m
alised'
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-09
E
l
ijah N
e
w
r
en
Documentation: fix
several
o
ne-char
a
cter-off sp
e
lling
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
E
lija
h
New
r
en
merge-recursive: ensure
we
w
rite
u
pdates for direc
t
ory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah
N
ewr
e
n
merge-recursive: av
o
id spur
i
ous rename
/
rename con
f
li
c
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah Newren
direc
t
o
r
y rename detec
t
i
on: ne
w
testcase
s
show
c
asing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
El
i
jah Newren
merge-recu
r
sive: fix
remaining dir
e
ctory rename + d
i
rty
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah Newren
m
e
r
g
e
-recursi
v
e:
fix overwriting dirty fil
e
s
involved
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah Newren
m
e
rge-recurs
i
v
e
: avoid clobbering untra
c
ked files w
i
th
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elij
a
h Ne
w
r
e
n
merge-recursiv
e
: a
p
ply necess
a
ry modifications
for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
merge-recu
r
si
v
e
:
when
c
om
p
aring f
i
les, don't include
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Ne
w
ren
merge-recursive: check for file l
e
v
el conflicts then
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah
N
ewren
merge-recursive: add computation of co
l
l
i
sions due
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newr
e
n
merge-recurs
i
ve: che
c
k for directory le
v
e
l
confli
c
t
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
me
r
ge-recursive: add ge
t
_dire
c
tory_re
n
ames(
)
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
El
i
jah N
e
w
r
en
merge-recurs
i
ve: make a helper func
t
ion for
c
lean
u
p
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
mer
g
e-recursive: split out code for deter
m
ining diff
_
f
i
lepa
i
rs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah N
e
w
ren
mer
g
e-rec
u
rsive: make
!o->detect_rename codepath more
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elija
h
N
ewre
n
m
e
r
ge-recursive:
f
i
x
leaks o
f
alloca
t
e
d ren
a
mes and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
merge-
r
ecu
r
sive: introduce ne
w
function
s
to handle
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
E
l
ija
h
N
ewren
m
e
rge-re
c
ursive
:
move
t
h
e
ge
t
_renames() fun
c
tion
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
El
i
jah Newren
d
irec
t
ory renam
e
d
e
tection: te
s
ts for handl
i
ng
o
verwriti
n
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
E
l
ijah Newren
direc
t
ory ren
a
m
e d
e
t
e
c
t
ion
:
tests fo
r
handling
overwriting
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah New
r
en
d
irec
t
o
ry
rename detection: miscellan
e
ous testc
a
ses
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
El
i
jah
Newren
direc
t
ory rename detection: te
s
t
ca
s
es
exploring
possibly
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
dire
c
tory rena
m
e detection
:
mo
r
e
i
n
volved
e
dge/corner
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
E
lijah
Newre
n
directo
r
y
r
e
n
ame detection
:
testcases checkin
g
whi
c
h
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
E
l
ijah Newre
n
d
i
r
ec
t
ory rename detection: files
/
dir
e
ctories
i
n the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
d
irectory r
e
name detection: partially renamed dire
c
tory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elij
a
h Newr
e
n
d
irectory rename
detection: testcases to avoid takin
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah New
r
en
directory rename detection: directory splittin
g
te
s
tcases
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Ne
w
ren
directory
rename
d
etecti
o
n: basic tes
t
cases
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-01-19
Elijah Newren
merge-recursive
:
add explana
t
ion for sr
c
_en
t
ry a
n
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-01-19
Elijah N
e
w
r
en
merge-recu
r
s
ive: fix logic ordering issue
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-01-19
Eli
j
ah
N
ew
r
en
Tighten and correct a few testcases for merging and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-22
Eli
j
ah Newr
e
n
m
erge-recur
s
ive: avoi
d
in
c
orpo
r
ating uncommitted cha
n
ges
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-22
Elija
h
Newren
mo
v
e
i
ndex
_
has_
c
hange
s
() from bui
l
t
in/am
.
c to merge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-22
Elijah Newren
t6044: recursive ca
n
sile
n
tly
incor
p
or
a
t
e
dir
t
y changes
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-05
Elijah
N
ew
r
e
n
strbuf: remove unus
e
d
stripspace function alias
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next