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
git-merge-tree.txt: add a section on potentional usage mistakes
2022-06-22
E
lijah Newren
git-merge-tree
.
t
x
t
:
a
dd
a
sect
i
on on potentional usa
g
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
Elijah
Newren
merge-tree:
a
d
d a --allow
-
unrelated-historie
s
flag
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
Eli
j
ah
Newren
merge-tree
:
allow `l
s
-
f
i
l
es -u` styl
e
info to be N
U
L
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
Elija
h
Newre
n
mer
g
e
-
o
r
t: optionally produce machi
n
e-re
a
d
able ou
t
put
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
Elijah Newren
m
e
r
ge
-
ort: st
o
re m
o
re spe
c
ific co
n
flict informa
t
ion
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
Eli
j
ah
N
e
w
r
en
me
r
ge
-
tre
e
: provide easy acce
s
s to `ls-fil
e
s -u` style
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
Elijah New
r
en
m
erge-tree: provide a list of which f
i
les
h
av
e
con
f
licts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
Elij
a
h N
e
wre
n
m
erge-ort:
r
e
mov
e
command-line-cen
t
r
i
c submodule
m
essage
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
E
lijah
N
ewr
e
n
m
e
rge-ort: provide a merge
_
get_conflicted
_
files
(
) helper
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
Elijah Newren
merge-
t
r
ee: support
i
ncluding merge messages in o
u
tput
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
Elijah Newren
merge-ort: split out
a
se
p
arate display_u
p
dat
e
_m
e
ssages
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
E
lijah
N
ew
r
en
mer
g
e
-
tree: implement real
m
erge
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
Elijah Newre
n
merge
-
tree: add opt
i
on pars
i
ng a
n
d initial shell for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
El
i
jah
N
e
w
r
en
merge
-
t
r
ee: move logic for existing mer
g
e into ne
w
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
Elij
a
h Newre
n
merge-tree:
rename merge_tre
e
s() to t
r
i
v
ial_merge
_
trees()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-04-22
Elijah N
e
wren
Doc
u
mentat
i
on:
som
e
sparsity wo
r
ding cl
a
ri
f
ications
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-04-22
Elijah Newren
git-sp
a
rse-c
h
eck
o
u
t
.
txt: mark non
-
cone mode
as
d
eprecated
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-04-22
Elija
h
Newren
git-
s
parse
-
chec
k
o
u
t
.
txt: fles
h
out pat
t
ern set
s
ecti
o
n
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-04-22
Elijah Newre
n
git-sparse-checkout
.
tx
t
: add a new
E
XAMPLES section
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-04-22
El
i
jah Newre
n
git-spa
r
s
e
-checkout
.
txt: shu
f
f
l
e som
e
s
e
ct
i
o
ns
a
n
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-04-22
Eli
j
a
h
Newren
git-sparse-checkout
.
txt: update
d
o
cs
f
or deprecation
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-04-22
E
l
i
j
a
h Newren
git-sparse-che
c
kout
.
t
x
t: wording
u
pdates for the con
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-04-22
E
l
ija
h
Newr
e
n
spa
r
s
e-c
h
eckout: ma
k
e --co
n
e t
h
e default
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-04-22
Elij
a
h Ne
w
ren
t
ests:
s
t
op
ass
u
min
g
--no-c
o
n
e
is the default mo
d
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-03-02
Elijah Newre
n
r
epo_read_index: add config to expect files outside
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-03-02
Elijah Newren
merge-ort: exclude m
e
s
s
ages fr
o
m i
n
ner
me
r
ges by default
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-20
Elij
a
h Ne
w
ren
merge-o
r
t: fi
x
sma
l
l
m
emory
l
eak in
unique_pat
h
()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-20
Elija
h
New
r
e
n
me
r
ge-ort: f
i
x sm
a
ll
memory leak in de
t
ect
_
and_process
_
r
enames()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-20
Eli
j
ah Newren
sp
a
rse-checkout
:
rej
e
ct
a
r
g
ume
n
ts in cone-m
o
de
that
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-20
Elijah
N
ewren
sparse-checkout: err
o
r
or warn
w
h
en
given
i
ndivi
d
ual
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-20
Elijah N
e
wren
spars
e
-c
h
e
ckout: p
a
y
a
ttention t
o
prefix for {set,
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-20
E
l
i
jah Newren
spa
r
se-checkout: correc
t
ly
s
et non-cone
m
od
e
w
he
n
e
xpected
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-20
Elijah N
e
w
ren
sparse-checkout: correct
reapply's handling
o
f options
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-17
Elijah Newren
me
r
ge-or
t
: make informa
t
ional m
e
s
sa
g
es from
recursive
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
Eli
j
ah Newren
d
iff-mer
g
es: avoid history simpl
i
fications whe
n
diffing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
Elijah Ne
w
ren
merge-
o
rt: mark conflict/warni
n
g
messages
f
rom inner
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
E
l
ijah
New
r
en
sho
w
, log
:
include conflict/wa
r
ning me
s
s
ages in --remerge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
Elijah N
e
wren
diff: add a
b
ili
t
y
t
o
i
nsert
a
dditional headers
for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
Elijah Newren
m
e
rge
-
ort: for
m
at mes
s
a
g
e
s sl
i
ghtly differen
t
for use
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
Elijah New
r
en
m
e
r
ge-ort: mark
a few
m
o
r
e c
o
nfl
i
ct m
e
ssages as omittable
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
Elijah Ne
w
ren
m
e
rge-
o
rt: captu
r
e and pri
n
t ll-merge wa
r
n
ings in our
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
Elijah Newren
l
l-me
r
g
e: make c
a
lle
r
s responsib
l
e for showing
warnings
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
Elijah New
r
en
log: clean
unneeded object
s
duri
n
g
`log --r
e
me
r
g
e-diff`
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
Elijah
N
e
w
ren
show, log:
provide a
--remerge-diff capability
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
Elijah Newren
repo-settings: re
n
ame
t
he tra
d
i
t
ional default f
e
tch
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
E
lijah Newren
repo-s
e
ttings: fix err
o
r handli
n
g for
unknown value
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
Elijah Newren
repo-settings:
fix ch
e
cking for fetch
.
negotiation
A
l
gori
t
hm
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-01-28
E
lijah New
r
e
n
sparse-checkout
:
fix a co
u
ple mi
n
or memory leaks
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-01-26
E
lijah Newren
s
e
q
uencer, stash: fix running from worktree su
b
dir
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-01-21
Elijah Newren
m
e
r
ge: fix memory leaks in cm
d
_
merge()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-01-21
Elijah Newren
merge-o
r
t: fix
m
emo
r
y leak in merge
_
ort_internal()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-01-17
Eli
j
ah
Newren
merge-ort: avoid assuming
a
ll renames detected
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-01-14
Elijah Newr
e
n
Accelera
t
e clear_skip_work
t
ree_fro
m
_present_files(
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-01-14
Elija
h
Newren
Update d
o
cumentat
i
o
n
r
elated to sparsity and the skip
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-01-14
Elijah Newren
repo_read_index: cle
a
r SKIP_WORKTREE bit from
f
iles
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-01-14
Elijah Newren
unpack-tr
e
es: f
i
x accidental loss of user c
h
anges
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-01-14
Elijah
Newren
t1011: add testc
a
se demonstra
t
ing
accid
e
n
tal loss of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-01-04
Elijah New
r
en
stash: do not r
e
t
urn before restoring un
t
racked files
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-30
Elijah
Newren
mer
g
e-ort: fi
x
b
u
g
w
ith renormal
i
z
a
tion and re
n
ame
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-23
Elijah Newren
sparse-checko
u
t: remove stray traili
n
g space
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
Eli
j
a
h
N
ewren
c
lone: avoid usin
g
deprecated `sparse-checkout
init`
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
Elijah Newren
Doc
u
me
n
t
a
tio
n
:
clarify/correct a few sparsi
t
y rel
a
t
e
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
Elijah Newren
git-sp
a
rse-check
o
ut
.
t
xt: up
d
ate to
d
ocumen
t
init/set
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
Elijah
Newren
sparse-ch
e
ckout: enable reapply to take
-
-
[no-]
{
cone
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
Elijah
N
ewren
sparse
-
c
h
e
ckout:
e
nable
`
s
et` to ini
t
ialize spar
s
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
E
l
ijah Ne
w
re
n
sparse-checkou
t
: split out co
d
e for tweaking se
t
tings
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
Elijah Newr
e
n
spa
r
s
e-chec
k
out: disallow --n
o
-stdin as an
a
rgument
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
Elijah Newren
sparse-checkout
:
add sanity-checks on initia
l
sparsit
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
Elija
h
N
ew
r
en
spar
s
e-checkou
t
: brea
k
apart functions for spar
s
e_checkou
t
_
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
El
i
jah Newren
sparse-checkout: pass use_
s
tdin as
a
parameter ins
t
ead
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
Elija
h
Newren
t2501: simplify the tests
since we ca
n
n
o
w
assume
desi
r
ed
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
Eli
j
ah
Newre
n
dir:
new flag to remove_dir_
r
ecurse() t
o
s
pare the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
Elijah
N
ewr
e
n
dir: avo
i
d incidentally
r
emoving the original_cwd in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
Elijah
N
ewren
stash:
do not attemp
t
to remove s
t
artup_info->or
i
g
inal_cwd
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
Elijah New
r
e
n
r
e
b
as
e
: do not a
t
tempt to remo
v
e star
t
u
p
_info->original_cwd
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
El
i
jah New
r
e
n
clean: do
not
a
ttempt to remove startup_in
f
o
-
>original_c
w
d
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
E
l
ijah Ne
w
ren
symlinks: do not i
n
c
l
ude startup_
i
n
f
o->ori
g
inal_c
w
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
Elijah Newren
u
npack-trees: ad
d
special
c
w
d
h
andling
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
E
l
ijah Ne
w
ren
unpack-tre
e
s: refuse to
r
emove startup_info-
>
original_cwd
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
Elijah Newren
s
etup: i
n
troduce st
a
r
t
up_info->orig
i
nal_cwd
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
Elijah Newren
t25
0
1:
add vario
u
s test
s
for removing the curr
e
nt working
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-05
Eli
j
ah New
r
en
s
equen
c
er:
d
o n
o
t e
x
port GIT_DIR
and
GIT
_
WORK
_
TREE
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-05
Elij
a
h N
e
wr
e
n
n
a
me-rev: pre
f
er shorter names over following
m
e
r
g
es
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-01
Elijah Newren
upd
a
te documentation for new zdiff3 con
f
lictS
t
y
le
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-11-30
Eli
j
a
h
Newren
seq
u
encer:
avoid adding exec commands
f
or non-commit
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-27
Elijah Newren
Documen
t
ation: call out
c
ommands that
n
uke untrac
k
ed
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-27
Elijah
N
e
wren
C
o
mment important codepaths regarding
n
u
k
i
n
g untracked
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-27
El
i
jah N
e
wren
u
npack-trees: avoid nuki
n
g u
n
tr
a
cked dir
in way o
f
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-27
Elijah Newren
unpack-t
r
ees
:
avoid nuking
u
n
tracked dir in
way of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-27
Elija
h
Ne
w
ren
Change unpac
k
_trees' 're
s
et' flag into an
e
num
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-27
Elijah Newre
n
R
e
m
ove ign
o
red file
s
by
d
efault when t
h
ey
a
re in the way
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-27
Elijah N
e
wren
unp
a
ck-tree
s
: make dir a
n
internal-
o
nly
struct
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-27
Elija
h
Newre
n
unpack-trees: introduce
preserve_
i
gnored to unpack_trees_opt
i
ons
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-27
El
i
ja
h
Newren
read-tree, merge-recursive
:
overwrite ignored files
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-27
E
lijah Newren
checkout,
r
ead-tree: fix l
e
ak of
unpack_trees_
o
ptions
.
di
r
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-24
Elijah Newren
t2500: add various tests
for nu
k
ing untracked files
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-20
Elija
h
N
e
wren
merge-ort: fix com
p
l
e
tely wrong com
m
e
nt
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-20
Elijah Newre
n
t
race2
.
h: fix trivial
c
omm
e
nt typo
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-12
Elijah
Newre
n
tests: remove leftove
r
untrack
e
d
f
il
e
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-10
Elijah
Newren
am: fix incorrect ex
i
t
s
tatus on am fail
t
o a
b
o
rt
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next