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
treewide: remove cache.h inclusion due to pager.h changes
2022-07-23
Eli
j
ah
Newren
merge: ensure we can actually restor
e
p
re-merge state
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-07-23
Elija
h
Ne
w
ren
merge:
m
ake restore_sta
t
e() restore staged sta
t
e
too
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-07-23
Elijah Newren
m
e
r
ge: fix save_state
(
) to work whe
n
there are stat
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-07-23
Elijah Newr
e
n
merge:
do not abort early if one
strategy
f
ails to
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-07-23
Elijah N
e
wren
mer
g
e:
a
bort if inde
x
does
no
t
match HEA
D
for
t
r
i
vial
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-07-23
El
i
jah
New
r
en
merge-resolve:
a
bort if
i
ndex does not
match HEAD
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-07-23
Elijah Newren
m
erg
e
-ort-wrappers: make print
e
d
message matc
h
t
he
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-07-06
Elijah Newren
merge-ort:
f
i
x
i
s
s
u
e with d
u
a
l
rename and
add/ad
d
conflict
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-07-06
E
lijah N
e
wren
merge-ort: shuffle th
e
computat
i
on and cleanup of potential
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-07-06
Elijah Newren
t6423:
a
dd tests of dual di
r
ectory
ren
a
m
e pl
u
s add
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-06-22
Elijah Newre
n
git-me
r
ge-tree
.
tx
t
: ad
d
a sectio
n
on pote
n
t
iona
l
usa
g
e
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-06-22
E
l
i
j
ah Newren
merge-tree: add a
-
-
a
llow-unrelated-h
i
stories f
l
ag
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-06-22
El
i
jah Newren
m
erge-tree: allow `ls-files -u` sty
l
e
info to b
e
NUL
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-06-22
Eli
j
ah Ne
w
ren
merg
e
-o
r
t: optional
l
y
p
r
oduce machine-readable
output
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-06-22
Elijah Newren
mer
g
e-ort: store mor
e
specific conflic
t
i
n
formation
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-06-22
Elijah N
e
wren
m
erge-tree: provide easy acces
s
t
o `ls-files
-u` style
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-06-22
Eli
j
ah Newren
me
r
ge-
t
ree: prov
i
de a lis
t
of which files have confl
i
c
ts
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-06-22
El
i
jah
Ne
w
ren
merge-ort: remove comma
n
d-line-centric submodu
l
e message
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-06-22
Elijah Newren
m
e
rge-ort:
prov
i
de a merge
_
get_conflicted_file
s
() h
e
lper
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-06-22
Eli
j
ah Ne
w
ren
merge-tree
:
support including me
r
ge m
e
ssa
g
es in output
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-06-22
E
lijah Newren
me
r
ge-ort:
s
plit out a
separate display_updat
e
_
m
essages
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-06-22
Elijah Newr
e
n
merge-tree:
i
m
pl
e
ment real merges
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-06-22
Elijah Newren
merge-tree: a
d
d op
t
ion p
a
rsing
a
nd
init
i
al
s
hell for
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-06-22
Elijah Newren
merge-tree: move logi
c
f
o
r
e
x
isting merge into
n
ew
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-06-22
Elijah Newren
merge-tree: re
n
am
e
merge_trees() to
t
r
iv
i
al_merge_trees(
)
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-04-22
Elijah Newren
Docum
e
n
tat
i
o
n: some
sparsity
wording
c
l
a
rificatio
n
s
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-04-22
Eli
j
ah
N
ewren
g
i
t-sparse
-
checkout
.
txt: mark
n
o
n-
c
one
mod
e
as depreca
t
ed
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-04-22
Elijah N
e
wren
git-sparse-checkou
t
.
txt
:
f
le
s
h ou
t
pat
t
ern set sec
t
ions
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-04-22
Elijah Newren
g
i
t
-sparse-checkout
.
t
xt:
a
dd
a ne
w
EXAMPLE
S
section
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-04-22
Elijah Newren
gi
t
-s
p
arse
-
c
h
eckout
.
t
x
t: shuffle so
m
e sections and
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-04-22
Elijah
N
ew
r
en
git-sparse-checkout
.
txt: up
d
ate do
c
s
for d
e
p
r
eca
t
ion
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-04-22
E
l
ijah Newren
git-spars
e
-
c
heck
o
ut
.
t
x
t: wording upda
t
es fo
r
the con
e
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-04-22
E
l
ijah New
r
en
sparse-checkout: mak
e
--cone the default
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-04-22
El
i
j
a
h N
e
wren
t
e
sts:
s
t
o
p
assu
m
i
n
g
-
-no-con
e
is
t
he def
a
ult mode
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-03-02
E
l
ijah
N
ew
r
en
r
epo_read_index
:
add config to expect fil
e
s outside
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-03-02
Elijah Newren
merge-ort: ex
c
lude messages f
r
om inner merges by default
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-02-20
Elijah
N
e
wren
m
e
rge-ort: fix small memory leak
i
n
unique_path(
)
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-02-20
Elijah
N
ewren
merge-ort: fix small memory le
a
k in det
e
ct_and
_
process_rename
s
()
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-02-20
Elij
a
h Ne
w
ren
sparse-checkout: reject ar
g
uments in
c
one-mode that
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-02-20
Elijah Newren
spa
r
se-checko
u
t: err
o
r or warn when given individual
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-02-20
Elijah Newre
n
sparse-checkout: p
a
y atte
n
tion
to
p
r
e
f
i
x for {set
,
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-02-20
Elijah Newre
n
s
parse
-
checkout: corre
c
tly set no
n
-
cone mode
w
hen ex
p
ected
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-02-20
Elijah Newren
sparse
-
ch
e
cko
u
t
: correct
reappl
y
's handli
n
g of options
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-02-17
Elija
h
Newren
merge-ort:
m
ake i
n
formational messages
fro
m
recurs
i
ve
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-02-02
Elijah Ne
w
ren
diff-me
r
ges: avoid hi
s
t
ory simplif
i
cations when diffing
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-02-02
Elijah Ne
w
ren
merge-ort
:
mark conflict
/
warning
messages from inner
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-02-02
E
l
i
j
ah Newren
s
how, log: include conflict/warning messa
g
es in --re
m
e
rge
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-02-02
Elijah Newren
diff:
a
d
d ability to insert additional
h
eaders for
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-02-02
Elijah
N
ew
r
e
n
merge-o
r
t:
fo
r
mat m
e
ssages slightly diffe
r
ent for use
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-02-02
Elij
a
h Newren
merge-ort: mar
k
a f
e
w
more co
n
flict
m
essages as
omittable
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-02-02
Elijah Newren
merge
-
or
t
:
capt
u
re
a
n
d
print ll-merge warnings
i
n
our
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-02-02
E
lijah Newren
ll
-
merg
e
: make
cal
l
ers responsible for showing warnings
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-02-02
Elijah
N
e
wren
log: clean unneeded objects d
u
ring `log --re
m
erge-
d
iff`
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-02-02
Elijah New
r
en
show,
lo
g
:
pr
o
vide
a
--remerge
-
d
iff capability
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-02-02
E
l
ijah New
r
en
rep
o
-settings: rename the
t
r
a
ditional default fet
c
h
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-02-02
Elijah Newren
repo-settings: fix error
handling for unknown value
s
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-02-02
Elijah Ne
w
ren
repo-settings: fix checking for fetch
.
nego
t
iationAlgor
i
thm
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-01-28
Elija
h
Newren
sparse-checkout: fix a
c
o
u
ple mi
n
or memory leak
s
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-01-26
Elijah Newre
n
sequencer, stas
h
:
fix running from worktree subdir
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-01-21
E
l
ijah
Newr
e
n
merge: fix me
m
ory lea
k
s in
c
m
d_merge()
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-01-21
Elija
h
N
e
wre
n
m
er
g
e-or
t
:
f
ix
m
emory leak in merge_
o
rt_internal
(
)
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-01-17
Elijah Newren
merge-ort: avoid
assuming
a
ll
r
ename
s
detected
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-01-14
E
lijah Newre
n
Accelerate
c
lear_skip_workt
r
ee_from_present
_
f
i
les(
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-01-14
Elijah Newren
U
pdate d
o
cumentati
o
n
r
e
l
ated
t
o
sp
a
rsit
y
and
t
he
s
kip
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-01-14
E
l
i
jah Newren
repo_rea
d
_index: clear SKIP_
W
O
R
KTREE
b
i
t from files
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-01-14
E
l
i
jah Newr
e
n
unpack
-
trees: fi
x
ac
c
i
d
ental loss
o
f user changes
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-01-14
Elijah
Newre
n
t101
1
: add testcase dem
o
n
s
trating a
c
cidental loss of
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-01-04
Elijah Ne
w
r
e
n
stash: do no
t
retu
r
n before restor
i
ng untracked
fi
l
es
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-30
Elijah New
r
e
n
m
erge-ort:
f
ix bug
w
ith renormalization and ren
a
me
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-23
Elijah N
e
wren
sparse-
c
h
eckout: re
m
ove stray trailing space
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-15
E
lijah Newren
clone: avoid u
s
ing d
e
pr
e
cated
`sparse-checkout init`
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-15
Elijah Newren
D
oc
u
me
n
tation: clarify/c
o
rre
c
t a few sp
a
rsity related
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-15
Elijah Newre
n
git
-
spa
r
se-checkout
.
txt:
u
pdate to do
c
ument init/s
e
t
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-15
Eli
j
ah Ne
w
ren
sparse-checkout: enable reapply t
o
take --
[
n
o
-]{cone
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-15
Elijah Newren
spa
r
se-checkout: enable `set` to
i
nitialize sparse
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-15
Eli
j
ah New
r
en
s
parse-ch
e
ckout: split out code for t
w
eaking settings
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-15
Elijah Newr
e
n
s
par
s
e-checko
u
t:
d
isa
l
low --no-std
i
n a
s
an ar
g
ument
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-15
Elij
a
h
N
e
wren
spar
s
e-c
h
eck
o
ut: add sanity-che
c
ks
on i
n
iti
a
l sparsity
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-15
E
l
ijah
Newren
spa
r
se-ch
e
ckout: break a
p
art functio
n
s for spars
e
_checkou
t
_
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-15
Elijah
N
e
wr
e
n
spar
s
e-checkout: pass use_stdin
as a p
a
rameter in
s
tead
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-09
Elijah N
e
wren
t25
0
1: simpli
f
y
t
he tests
s
ince we can now
assum
e
desi
r
ed
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-09
E
l
ijah Newren
dir: ne
w
flag
t
o r
e
move_dir
_
recurse() to spar
e
t
h
e
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-09
Elijah Newren
dir:
a
void incidentally removin
g
the
origi
n
al_cwd in
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-09
Elijah Newren
s
t
ash: do
n
ot attempt to remove
s
tartup_
i
nfo->original_c
w
d
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-09
E
l
i
j
ah Newren
rebase:
d
o not attempt t
o
remove startup_in
f
o->original_cwd
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-09
El
i
jah N
e
w
r
en
cl
e
an: do not attempt t
o
re
m
ove startup_info
-
>original_cwd
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-09
Elijah Newren
symlinks:
d
o not incl
u
de start
u
p_i
n
f
o
->original_cwd
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-09
Eli
j
ah Newre
n
unpack-trees: add
spec
i
a
l
c
wd handling
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-09
Elijah Newren
u
npack-tr
e
es
:
refuse to remove
s
t
a
r
tup_inf
o
->ori
g
inal_cwd
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-09
Elijah Newr
e
n
setup:
i
ntroduce startup_info->original_cwd
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-09
Elijah Newren
t
2
501: a
d
d various t
e
sts for removi
n
g
the current working
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-05
Elija
h
Newren
sequencer:
d
o not export GIT_D
I
R
and GIT_WORK_TR
E
E
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-05
E
l
ijah Newren
name-rev: p
r
e
f
er shorter
names o
v
er following merges
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-01
Elijah
N
e
w
ren
update docu
m
entation
f
or new zdiff
3
co
n
flictStyle
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-11-30
E
l
ijah Newren
seq
u
enc
e
r: avoid adding exec commands for
non-commit
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-09-27
Elijah Newren
D
o
cum
e
ntation
:
call
o
ut comm
a
nds that nuke untracked
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-09-27
Elijah Newren
Comme
n
t
i
mportant codepaths
regar
d
ing
n
uking untracked
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-09-27
Elijah Newren
unpa
c
k-t
r
e
e
s: avo
i
d n
u
king unt
r
a
cked dir in way of
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-09-27
Elij
a
h Newren
unpack-tre
e
s
:
avoid
nuki
n
g untrack
e
d d
i
r in way
o
f
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-09-27
Elijah Newren
Change unpack
_
tree
s
'
'
res
e
t' flag into
an enum
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
next