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
git-merge-tree.txt: add a section on potentional usage mistakes
2022-06-22
Eli
j
ah Newren
git-merge-tr
e
e
.
txt: add
a
section on potentio
n
al usage
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-06-22
Elijah Newren
merge-tree: add
a -
-
allow-unrelated-h
i
stories flag
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-06-22
E
l
ijah Newren
m
erge-tree:
allow `ls-fi
l
es -u` style info to be NUL
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-06-22
Elijah Newren
merge-ort: optionally produce machi
n
e-readable output
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-06-22
Elij
a
h
N
e
w
ren
me
r
ge-ort: store more specific co
n
fl
i
c
t
i
nfo
r
mation
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-06-22
El
i
j
a
h Ne
w
r
e
n
merge-t
r
ee
:
provide easy a
c
cess to `ls-f
i
l
e
s
-u`
s
tyle
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-06-22
E
l
ijah Newren
merge-tree:
provi
d
e a li
s
t
of which files ha
v
e
conflict
s
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-06-22
E
lijah
Newren
merge-ort: remove c
o
mmand-l
i
ne-centric su
b
modul
e
m
e
ssa
g
e
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-06-22
Eli
j
ah
Newren
merge-o
r
t: pr
o
vide
a
merge_get_conflicted_files() help
e
r
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-06-22
Elijah Newren
merge-tree:
supp
o
rt including merge messages
i
n
outpu
t
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-06-22
Elijah Newren
m
e
rge-ort
:
split out a separate display_update_messages
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-06-22
Elijah Newren
merge-tree: implement real merges
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-06-22
Elij
a
h Ne
w
ren
merg
e
-tree
:
add option par
s
ing and initial s
h
ell for
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-06-22
E
l
ijah Newren
m
erge-t
r
ee: move
logic for ex
i
sting merge
i
nto new
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-06-22
Elij
a
h Newren
merge-tree: r
e
name
m
erg
e
_trees() to trivia
l
_merge_trees
(
)
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-04-22
Elijah Ne
w
ren
Documentation: some sparsi
t
y wo
r
ding
clarifications
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-04-22
Elij
a
h Newren
git
-
sparse-ch
e
c
k
out
.
txt: mark no
n
-cone mode as dep
r
ec
a
ted
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-04-22
El
i
jah Ne
w
r
en
g
it-sparse-checkou
t
.
txt: flesh
o
u
t pa
t
t
ern set sections
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-04-22
E
lija
h
Newren
git-sparse-check
o
ut
.
txt: ad
d
a new EXAMPLES s
e
c
tion
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-04-22
Elijah Newre
n
git-sparse-
c
heckout
.
txt: shuffle s
o
me sections an
d
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-04-22
E
lijah Newre
n
g
it-sparse-ch
e
ckout
.
txt: update docs for deprecation
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-04-22
Elija
h
N
e
w
ren
g
it-spar
s
e-check
o
ut
.
txt: wording updates for the
cone
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-04-22
El
i
jah Newren
spa
r
se-checkout: mak
e
-
-
cone the
d
efau
l
t
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-04-22
Elijah Newren
t
e
sts: stop as
s
um
i
ng -
-
no-cone
i
s the defa
u
l
t
mode
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-03-02
Elijah Newren
repo_rea
d
_inde
x
: add
c
onfig to expect f
i
l
es ou
t
side
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-03-02
Elijah Newre
n
me
r
ge-ort: exclude messages
f
rom inner merges by default
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-02-20
Elija
h
Newren
mer
g
e-ort: fix small
m
emory leak in un
i
q
u
e
_path()
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-02-20
Elijah Ne
w
ren
merge-or
t
: fix small memory leak in det
e
c
t
_and_proc
e
s
s
_renames()
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-02-20
Eli
j
ah
N
ewren
sparse-checkou
t
:
rej
e
ct argum
e
nts in cone-mode that
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-02-20
Elijah Ne
w
re
n
s
p
a
r
se-checkout:
e
r
ror or warn when g
i
ven
ind
i
vidual
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-02-20
Elijah Newren
sparse
-
checkout: pay attention to prefix for {set,
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-02-20
El
i
jah Newren
sparse-checkout: cor
r
ectly
s
et non-cone mode wh
e
n expected
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-02-20
E
l
ijah Newren
sp
a
r
s
e-c
h
eckout: correct reapp
l
y's handling o
f
options
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-02-17
Elij
a
h Newr
e
n
m
erge-ort: ma
k
e inform
a
tional me
s
sages from recursi
v
e
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-02-02
El
i
jah Newren
diff-m
e
rges: a
v
oid history simplifications
w
h
en
d
i
ffi
n
g
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-02-02
Elijah Newren
merge-ort: mark con
f
l
ict/warning mes
s
ages fro
m
inner
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-02-02
Eli
j
ah Newre
n
show, log: in
c
lude conflict/w
a
rnin
g
m
ess
a
ges in --
r
emerg
e
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-02-02
Elij
a
h Newr
e
n
di
f
f
: ad
d
ab
i
lity to insert additional h
e
a
d
e
rs for
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-02-02
El
i
j
ah Newren
mer
g
e-
o
r
t
:
f
orma
t
m
e
s
s
ages slightly different fo
r
u
se
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-02-02
Elij
a
h Newren
merge-ort: ma
r
k a
few more
conf
l
ict mess
a
ges as o
m
ittab
l
e
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-02-02
Elijah New
r
en
merge-ort: capture and pri
n
t ll-merge warnings i
n
our
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-02-02
Elijah Newren
l
l
-m
e
rg
e
: make c
a
l
l
ers responsi
b
le for showing warnings
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-02-02
Elijah
N
e
w
re
n
log: clean unne
e
ded objec
t
s during `log --remerge-diff`
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-02-02
E
l
ij
a
h N
e
wren
sh
o
w, log:
p
rovide a --r
e
merge
-
diff capa
b
i
l
ity
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-02-02
Eli
j
ah Newr
e
n
repo-settings: r
e
name the traditi
o
nal d
e
fault fetch
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-02-02
Elijah
N
ew
r
en
repo-settings:
f
ix
e
r
r
or handlin
g
for unknown
v
a
lues
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-02-02
Elijah Newren
rep
o
-sett
i
ngs: f
i
x checking for fetch
.
neg
o
tiationAlgorith
m
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-01-28
Eli
j
a
h
Newren
sparse-check
o
ut
:
fix a coup
l
e min
o
r memor
y
leaks
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-01-26
Elijah New
r
en
sequencer, st
a
sh: fix running from wor
k
tree subdi
r
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-01-21
Elijah N
e
wren
merge:
fi
x
me
m
ory leaks
in cmd_merge()
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-01-21
Elijah Newr
e
n
m
e
r
g
e-ort: f
i
x memory leak
in mer
g
e_ort_int
e
rn
a
l()
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-01-17
Elijah Newren
merge-ort: avo
i
d as
s
u
m
ing all
r
enames detected
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-01-14
Eli
j
ah Newren
Accele
r
ate clear_skip
_
w
or
k
tree
_
from_present_files(
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-01-14
Elijah Newr
e
n
Updat
e
d
o
c
umentati
o
n
related to spar
s
ity and the ski
p
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-01-14
Elijah Newre
n
r
e
po_read_index: clear
S
K
IP_WORKTREE bit from fil
e
s
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-01-14
Elijah Newren
u
npack-trees: fix
ac
c
idental loss of use
r
changes
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-01-14
Eli
j
ah Newren
t1011:
add testcase demons
t
rating accidental
l
oss
o
f
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-01-04
Elijah Newr
e
n
sta
s
h: do not r
e
t
urn before restori
n
g u
n
tracked files
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-30
Eli
j
ah Newren
merge
-
ort: fi
x
bug with r
e
normalization
a
nd renam
e
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-23
Elija
h
N
ewren
sparse-checkout:
rem
o
ve st
r
ay trailin
g
sp
a
ce
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-15
Elijah Newren
clone: avoid using de
p
reca
t
ed `sparse-check
o
ut init`
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-15
Elijah Newr
e
n
Doc
u
mentation: clarify/correct a few sp
a
rsity
re
l
at
e
d
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-15
Eli
j
ah Newren
git-s
p
a
r
se
-
checkout
.
txt: update to document in
i
t/se
t
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-15
Elijah Newre
n
sparse-ch
e
ckout: ena
b
le
reap
p
ly to take --[no-]{c
o
ne
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-15
E
lijah Newren
s
parse-checkout:
e
nable `set` to init
i
alize s
p
arse
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-15
Eli
j
ah Newr
e
n
spa
r
se-c
h
eckout:
s
p
lit out c
o
de for tweaking setti
n
g
s
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-15
Elijah
Newren
sparse-ch
e
ckout: d
i
sallow --no-stdin as
a
n argume
n
t
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-15
El
i
jah
N
ewren
sparse-checkout: add san
i
ty-checks o
n
initi
a
l
sparsity
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-15
Elij
a
h Newre
n
sparse-checkout: break apa
r
t functions
f
or sparse_ch
e
c
kout_
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-15
Elija
h
Newr
e
n
s
parse-chec
k
out: pa
s
s use_stdi
n
as a
par
a
meter instead
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-09
E
l
i
jah
Newren
t2501: simplif
y
the tes
t
s si
n
ce we c
a
n
n
ow assum
e
d
e
s
ired
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-09
Elijah Newren
dir: n
e
w flag t
o
re
m
o
v
e_
d
ir
_
recurse() to spar
e
t
h
e
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-09
Elijah Newren
d
i
r: av
o
id incidentally re
m
ov
i
ng the original_cwd i
n
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-09
Elijah Newren
s
tash: do not attempt to rem
o
ve
st
a
rtup_info->origin
a
l_cwd
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-09
Elijah
Newren
rebase
:
do not
a
t
t
empt
t
o
r
e
move start
u
p_
i
nfo->original_c
w
d
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-09
Elijah Newren
clean: d
o
not attempt to remov
e
s
t
artup_
i
nf
o
->original_cwd
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-09
Elijah Newren
symlink
s
: do n
o
t incl
u
de st
a
rtup_info
-
>original_cwd
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-09
Elijah
N
ewren
unpack-tr
e
e
s
: add
s
pecial cwd handling
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-09
Elijah
N
ewren
unpack-tre
e
s: refuse to remove st
a
rtup
_
i
n
f
o->origin
a
l_cwd
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-09
Elijah Newren
setup: in
t
roduce startup_info->or
i
g
i
nal_c
w
d
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-09
El
i
jah Newren
t
2
5
01: add
v
arious
tests fo
r
r
emoving t
h
e
c
urrent working
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-05
Eli
j
ah New
r
en
sequencer: d
o
not export GI
T
_DIR and GIT_WORK_TREE
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-05
Elijah Newren
name-rev: pref
e
r sh
o
rter names over following
m
erges
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-12-01
Elijah N
e
wre
n
u
p
d
ate docum
e
n
t
atio
n
for new zdiff3
c
onflictSty
l
e
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-11-30
Elijah Newren
sequencer: avoid ad
d
i
n
g
e
xec c
o
mm
a
nds f
o
r
non-commit
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-09-27
Elijah
N
ewren
Documentation: call out comma
n
ds that nuk
e
u
n
t
ra
c
k
ed
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-09-27
Elijah Newren
Comment i
m
portant codepaths regarding nu
k
ing untra
c
k
e
d
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-09-27
Eli
j
ah Newr
e
n
u
n
pac
k
-trees: avoid nuking untracked di
r
in way
of
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-09-27
Elijah Newre
n
u
npack-trees: avoid nuk
i
n
g
u
ntracked dir i
n
way of
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-09-27
Eli
j
ah Newren
C
h
ange unpack_t
r
ees' 'reset' flag into an e
n
um
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-09-27
El
i
jah Newren
Remov
e
ignored fi
l
e
s
by default when th
e
y
are in
t
he
w
ay
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-09-27
Elijah
Newren
u
n
pack-trees: make
dir an i
n
ternal-only
struct
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-09-27
Elijah Newren
unpack-trees: introduce
p
reserve_ignored to unpack_trees_options
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-09-27
E
lijah
Newren
re
a
d-tree,
m
erge-r
e
cursiv
e
: over
w
r
i
t
e
ignored
f
iles
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-09-27
Elijah Newren
checkout,
r
ead-tre
e
: fix
le
a
k of unpack_t
r
ees_options
.
d
ir
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-09-24
E
l
ijah
N
ewren
t2500: ad
d
various
t
ests for
nu
k
ing untrack
e
d fi
l
e
s
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-09-20
Elijah Newre
n
merge-ort: fix completely
w
rong commen
t
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-09-20
Elijah N
e
wren
trace2
.
h: f
i
x
trivial commen
t
typo
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-09-12
E
l
ija
h
Newren
tests: remove leftover
u
ntracke
d
files
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2021-09-10
Elijah N
e
w
r
en
am
:
f
ix incorre
c
t exit status on am fail
t
o
a
bort
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
next