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
merge-ort: provide a merge_get_conflicted_files() helper function
2022-06-22
Elijah Newren
merge-ort: provide a merge_g
e
t_confl
i
cted
_
f
iles() h
e
lper
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-06-22
Elijah Newren
merge-tree:
support includ
i
ng merg
e
mess
a
ges in output
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-06-22
Elij
a
h
N
e
w
ren
merge-or
t
: spl
i
t
o
ut a s
e
parate dis
p
la
y
_upd
a
te_messages
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-06-22
El
i
jah N
e
wren
merge-tree:
i
mpleme
n
t
real merg
e
s
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-06-22
Elijah Newren
merge-tr
e
e: add option
p
arsing and initial shell for
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-06-22
Elijah Newren
merge
-
tr
e
e: mov
e
lo
g
ic
f
or existing mer
g
e into new
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-06-22
Elijah Newr
e
n
merge-tree
:
re
n
ame merge_trees
(
)
t
o trivia
l
_
merge_tr
e
es(
)
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-04-22
El
i
jah
N
ewre
n
Documentation: some sparsity wor
d
i
n
g c
l
arifications
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-04-22
Elijah
N
e
wren
git
-
sparse
-
checkout
.
txt: m
a
rk non-cone mode
a
s depr
e
c
a
ted
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-04-22
Elijah
N
ewren
gi
t
-sparse-che
c
k
o
ut
.
txt: flesh out pattern se
t
sections
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-04-22
Elijah Newre
n
gi
t
-sparse-checkout
.
t
x
t: add
a
new E
X
AMPL
E
S section
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-04-22
Elijah New
r
en
git
-
sparse-checkou
t
.
t
x
t:
s
huffle some
sections
a
n
d
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-04-22
Elijah Newren
git-s
p
arse-checkout
.
txt: update
d
o
cs
for depre
c
ation
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-04-22
Elijah Ne
w
re
n
git-sparse
-
checkout
.
txt:
w
ording up
d
ates fo
r
t
he
c
one
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-04-22
Elijah
N
ewren
s
p
arse-ch
e
ckout
:
mak
e
--co
n
e
th
e
default
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-04-22
El
i
jah Newren
tests:
s
top
a
s
suming --no-co
n
e is the
defa
u
lt mode
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-03-02
Elijah N
e
wren
repo_read_index: add config to expe
c
t files ou
t
side
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-03-02
Elija
h
Newren
mer
g
e-ort: excl
u
de
m
e
s
sage
s
from
i
n
ner merges
b
y d
e
f
ault
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-02-20
El
i
j
ah Newren
merge-ort: fix sma
l
l memory leak
in unique_path()
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-02-20
Elijah Newren
merge
-
ort:
f
ix small me
m
ory le
a
k i
n
detect_an
d
_pro
c
ess
_
re
n
ames(
)
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-02-20
Elijah Newre
n
sp
a
rse-che
c
k
o
ut: reject arguments in cone-
m
ode that
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-02-20
Elijah Ne
w
ren
s
p
arse-checkout: error or
warn when given
i
n
d
ivid
u
al
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-02-20
E
l
ijah
Newren
sparse-chec
k
o
ut:
p
ay attent
i
on to prefix for {set,
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-02-20
Elijah
Newren
sparse-checkout: correctly set non-cone mode when
e
x
pected
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-02-20
E
lijah New
r
en
sparse-ch
e
ckout: corr
e
c
t re
a
pply's hand
l
ing of options
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-02-17
El
i
jah Newren
merge-ort: ma
k
e informational me
s
sages
f
rom recursi
v
e
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-02-02
E
lijah
N
ewr
e
n
diff-mer
g
es: avo
i
d h
i
story simplifications when diffing
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-02-02
Elijah
N
e
wren
merge-ort
:
mark
conflict/w
a
rnin
g
messages from inner
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-02-02
Elijah Newren
show,
l
og:
include conflict/warning mes
s
ag
e
s
i
n --re
m
erge
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-02-02
Elijah New
r
en
diff:
a
dd
a
bility to
i
nsert
additional he
a
ders for
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-02-02
Elijah Newr
e
n
merge-or
t
:
format me
s
sage
s
slightly
d
i
f
ferent for use
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-02-02
Elijah Newren
merge-
o
rt:
mark a
few more
c
on
f
l
i
ct m
e
s
s
ages
as omittable
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-02-02
Elija
h
Newren
m
er
g
e-
o
rt:
capture a
n
d p
r
int l
l
-merge wa
r
nings in o
u
r
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-02-02
Elijah Newre
n
ll-merge: mak
e
c
a
ll
e
rs
responsible fo
r
sho
w
ing warnings
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-02-02
Elijah N
e
wren
log: cl
e
an unn
e
eded object
s
during `log --remerge-di
f
f`
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-02-02
Elij
a
h Newren
s
how, log:
p
r
o
vide a -
-
remer
g
e
-
diff ca
p
ability
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-02-02
Elijah Newren
repo-
s
ettings: rename the tra
d
itional
def
a
u
lt fetc
h
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-02-02
Elijah Newren
re
p
o-se
t
ting
s
:
f
ix
error handling
f
or u
n
known val
u
es
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-02-02
Elijah Newren
r
epo-setti
n
gs: fi
x
checki
n
g for fetc
h
.
n
e
gotiationAlgorith
m
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-01-28
Elija
h
Newren
sparse-checkout: fix
a
couple minor
m
em
o
ry leaks
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-01-26
Elijah Newren
sequen
c
er, stash: fix runni
n
g from worktree subdir
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-01-21
Elijah Newren
merge:
f
i
x memory leaks
i
n
c
md_
m
erge()
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-01-21
Elijah Ne
w
ren
merg
e
-ort:
f
i
x
memory leak in merge_ort_internal()
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-01-17
Elijah
N
ewren
merge
-
ort: av
o
id assuming all renames dete
c
ted
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-01-14
E
lijah Newren
A
c
celerate
cle
a
r_skip_worktree_from_pres
e
nt_
f
iles
(
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-01-14
Elijah Newre
n
Update
d
ocumen
t
ati
o
n rel
a
ted
t
o
sparsity
a
nd the skip
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-01-14
Elija
h
Newren
repo_read
_
index: c
l
ear SKIP_WORK
T
R
E
E bit from files
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-01-14
E
lijah Newren
u
npack-trees:
fix
acci
d
e
n
tal loss of us
e
r changes
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-01-14
Elijah Newren
t
1011: add testcase demons
t
rating
acc
i
dental loss of
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-01-04
E
lijah Newren
stash
:
do n
o
t retu
r
n before res
t
orin
g
untra
c
ked fi
l
es
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-30
Elijah Newre
n
me
r
ge-
o
rt: fix bug with re
n
or
m
a
lization and renam
e
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-23
Elijah
New
r
en
sparse-checkout: remove s
t
ray
trailing sp
a
ce
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-15
Elijah Ne
w
ren
c
l
on
e
:
avoid using deprecated
`
s
parse-checkout i
n
it`
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-15
Elijah N
e
wren
Documentation: clarify/
c
or
r
ect
a fe
w
sparsity related
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-15
Elijah Newren
git-sparse
-
check
o
ut
.
t
xt
:
update to document in
i
t/se
t
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-15
Elijah Newren
sp
a
r
se-checko
u
t: enable
reapply to
t
a
ke
-
-
[no-]{co
n
e
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-15
E
lijah Newre
n
sparse-checko
u
t
:
enable `set` to initia
l
ize sparse
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-15
E
l
ijah Newren
sparse-
c
h
eckout:
s
p
l
it out code fo
r
t
w
eaking setting
s
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-15
Elijah
N
ewren
sparse-checkout:
d
i
s
a
l
low --no-stdin a
s
an a
r
gument
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-15
Elijah
Ne
w
r
e
n
sparse-
c
heckou
t
: add sanity-
c
hecks on i
n
itial spars
i
t
y
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-15
E
lijah N
e
wren
s
p
a
rse-
c
h
e
ck
o
u
t:
br
e
ak
a
part functions
f
or spar
s
e_checkout_
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-15
E
lij
a
h
N
ewren
sp
a
rs
e
-checkout: pass
use_std
i
n as a p
a
ramete
r
inst
e
ad
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-09
Eli
j
ah Newren
t2501
:
simplify the tests since we can now assume desired
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-09
Elijah
N
e
w
r
en
dir: new f
l
ag to r
e
move_dir_recurs
e
() to spa
r
e the
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-09
Elijah Ne
w
ren
dir: a
v
o
id
incidentally rem
o
vin
g
the original_cwd in
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-09
E
l
i
jah
N
ewren
stash: do not
a
t
t
empt to
rem
o
v
e
startup_info->origi
n
al_cwd
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-09
Elijah Newren
rebase: do not attempt to remove
s
tartup_
i
nfo->origin
a
l_cwd
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-09
Eli
j
ah Newren
cl
e
a
n: do not
a
ttempt
t
o remove sta
r
tu
p
_info->original_cwd
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-09
E
l
ijah Newren
symlink
s
:
do
n
ot in
c
lude
s
t
ar
t
up_info->origina
l
_cwd
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-09
Elija
h
Ne
w
ren
unpa
c
k-trees: add speci
a
l
cwd handling
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-09
Elijah Newren
unpack-trees: refus
e
to
r
emove
s
tartu
p
_
info->
o
ri
g
inal_cwd
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-09
E
lijah Newre
n
setu
p
: i
n
troduce start
u
p
_
info->ori
g
inal_
c
wd
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-09
Elija
h
Newre
n
t
2
501: ad
d
variou
s
tests for
r
emoving the
c
urren
t
working
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-05
Elijah Newren
s
e
quencer: do n
o
t ex
p
ort G
I
T_DIR and
GIT_WOR
K
_TREE
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-05
Elijah Newren
name-rev: prefer sho
r
ter names ov
e
r
following merge
s
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-01
E
l
ijah Newr
e
n
updat
e
documen
t
a
t
i
o
n for new
z
d
iff3 conflictS
t
yle
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-11-30
Elijah Newren
s
equenc
e
r: avoid
adding
exec command
s
for non-commit
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-09-27
Elij
a
h Newren
D
o
c
um
e
n
tation: call out commands that
nuke
u
ntracked
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-09-27
Elijah Ne
w
ren
C
o
mment i
m
portant codepaths regarding nuking
un
t
racked
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-09-27
Elijah
Newren
u
n
pack-trees: avoid nu
k
ing untracked
dir in way of
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-09-27
Elijah N
e
wr
e
n
unpack-tr
e
es: avo
i
d
n
uking untracked dir in way of
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-09-27
Elijah Newren
Change
u
n
p
a
c
k_trees
'
'reset' fl
a
g into a
n
enum
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-09-27
E
lijah Newre
n
R
e
move ignor
e
d
file
s
by default when th
e
y
are in th
e
way
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-09-27
Elijah New
r
e
n
un
p
a
c
k-trees: mak
e
dir an interna
l
-
on
l
y stru
c
t
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-09-27
Eli
j
a
h
New
r
en
un
p
ack-trees: intro
d
uce preserve_ignore
d
to
unpack_trees_options
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-09-27
Elijah Newren
read-t
r
ee
,
me
r
ge-recursive: ov
e
rwri
t
e ignored files
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-09-27
E
l
i
j
ah
N
ewren
c
h
e
c
kout, read-
t
r
e
e:
fix leak
of unpa
c
k_trees_optio
n
s
.
dir
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-09-24
E
l
ijah
N
e
wren
t2500: add v
a
rio
u
s
tests fo
r
nuking untrac
k
ed
files
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-09-20
Elijah
N
ewren
merge-ort:
fix comp
l
etely wrong co
m
ment
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-09-20
E
li
j
ah
N
ewren
trace2
.
h: fix trivial
comment typo
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-09-12
E
lijah
N
ewren
t
ests: remove leftov
e
r
u
ntracked
files
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-09-10
Elij
a
h Newren
am: fix
incor
r
ect exit sta
t
us on am f
a
il
t
o abort
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-09-10
Elijah
Newren
t
4151: a
d
d a few am --abort tes
t
s
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-09-10
Elijah N
e
wren
git-am
.
txt: cl
a
rify --a
b
ort be
h
avior
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-09-10
Elijah Newren
stash:
restore untracked fi
l
es AFTER restoring tracked
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-09-10
E
lijah Newr
e
n
stash:
a
v
o
id feeding di
r
ect
o
ries
t
o up
d
ate-
i
ndex
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-09-10
Elijah Newren
t
3903: document a pair
of directory/f
i
l
e bugs
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-08-05
E
l
ijah
N
ewren
Upd
a
te docs
for change of default m
e
rge ba
c
k
e
nd
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-08-05
E
l
ija
h
Ne
w
ren
Change default
m
erge bac
k
end
f
r
om recu
r
sive to o
r
t
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-08-05
Eli
j
a
h
Newr
e
n
U
p
date er
r
or message and code comment
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
next