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
E
l
i
jah Newren
git-merge-tree
.
txt: add a sec
t
ion on p
o
t
ention
a
l usa
g
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
Elijah Newren
m
erge-tree: ad
d
a
-
-allow-u
n
related-histories flag
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
E
lijah
New
r
en
merge-tr
e
e: al
l
ow `ls-files -u` style info to be NUL
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
E
l
ija
h
N
e
wre
n
merge-
o
rt:
o
ptional
l
y produc
e
machi
n
e-re
a
dabl
e
o
u
tput
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
Elijah
N
ewre
n
merge-
o
rt: store more specific co
n
f
lict in
f
orma
t
ion
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
Elijah Newren
merge-t
r
ee: provide
e
as
y
a
c
cess to `ls-files
-u`
s
tyle
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
Elijah Newr
e
n
m
e
rge-tree: prov
i
de a list of w
h
ich files
h
a
ve
c
onflicts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
Elijah
N
e
wren
me
r
ge-or
t
: rem
o
ve
command-line-
c
entric subm
o
dule message
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
Elijah
N
ew
r
e
n
me
r
ge-ort: provide
a
merge_get_con
f
licted_files
(
)
helper
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
Elijah N
e
wr
e
n
merge-t
r
ee: support includin
g
merge messag
e
s
i
n
output
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
Elij
a
h
Newren
merg
e
-ort: s
p
lit out a separate displa
y
_update_me
s
sages
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
El
i
jah Newren
me
r
g
e
-tre
e
: implement re
a
l merges
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
Elijah New
r
e
n
merge-tree:
add opt
i
o
n
parsi
n
g and initial shell for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
Elij
a
h Ne
w
ren
merge-tree:
m
ove logic
f
or existing
merge
i
nto
n
ew
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
E
li
j
ah Newren
me
r
ge-tree: ren
a
me merge_
t
rees() to trivial_merge_trees()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-04-22
Elijah Ne
w
ren
Documentation: some spars
i
ty wording
c
larification
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-04-22
El
i
jah Ne
w
ren
git-sparse-ch
e
c
k
out
.
txt: mark non-cone
m
o
de as de
p
recate
d
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-04-22
E
l
i
ja
h
Newren
git-
s
par
s
e-
c
heck
o
ut
.
txt: fl
e
sh out pattern se
t
sections
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-04-22
Elijah Newren
git
-
sp
a
rse-checkout
.
t
x
t: add a n
e
w
EXAMPL
E
S section
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-04-22
Elijah Newren
gi
t
-spa
r
s
e
-check
o
ut
.
txt: shuffle some sections
and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-04-22
Elijah Newren
git-sparse-
c
he
c
k
out
.
txt: update
d
ocs for deprecation
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-04-22
Elijah New
r
en
gi
t
-sp
a
rse-chec
k
out
.
txt:
w
ording u
p
dates f
o
r the
c
one
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-04-22
E
l
ijah Newren
sp
a
rse-check
o
ut: make --cone the
default
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-04-22
Elij
a
h Newren
t
ests
:
stop assumi
n
g --
n
o-
c
on
e
is
the d
e
fa
u
lt mode
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-03-02
Elijah Newr
e
n
repo_read_index:
ad
d
config to expect files outside
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-03-02
Eli
j
ah New
r
en
merge
-
ort: exclu
d
e
m
es
s
ages f
r
om inner merges by default
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-20
Elij
a
h New
r
en
merge-ort: fix small memory leak in unique_path()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-20
Elijah Newren
merge
-
ort: fix small memory lea
k
in detect_and_process_renames
(
)
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-20
Elijah
Newre
n
spa
r
s
e
-c
h
ec
k
out:
re
j
ect
a
r
gu
m
ents in con
e
-
m
ode that
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-20
Elijah New
r
e
n
sparse-c
h
eckout: err
o
r
or
w
arn wh
e
n g
i
ven
i
ndividual
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-20
Elijah
Newren
s
p
arse-c
h
e
ckou
t
:
p
ay
attention to
p
r
efix
f
or {set,
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-20
Elijah Newren
spar
s
e-checkout
:
correctly set
n
on
-
c
o
n
e
mode
when expected
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-20
Elijah N
e
wren
sparse-checkout: correct reapply's handling of options
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-17
E
lija
h
Newren
merge-o
r
t: make i
n
format
i
on
a
l messages
f
rom recursive
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
Elijah
N
ewre
n
diff
-
merge
s
: av
o
id hi
s
t
o
r
y simplifications when diffing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
E
l
ijah Newren
merge-ort: mar
k
c
o
n
flict/warning messages from inner
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
Elijah N
e
wren
show, log
:
include conf
l
ic
t
/warning messages i
n
--remerge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
Elijah
N
ewren
diff: ad
d
ability to inser
t
addi
t
i
o
n
al headers for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
Elija
h
N
e
wren
merge-ort: form
a
t message
s
slightly different for
u
se
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
Elijah N
e
w
ren
m
er
g
e-ort: mark a few
m
ore conflict m
e
ssage
s
as omittable
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
Eli
j
ah Newren
merge-ort: ca
p
ture and pr
i
n
t ll-merg
e
w
a
rnings
in our
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
Elijah New
r
e
n
ll-
m
erge: make callers r
e
sponsible for showing war
n
ings
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
Elij
a
h Newren
log:
cl
e
an
u
nne
e
ded objects during
`
l
o
g
--remerge-diff`
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
El
i
jah Newren
show
,
log: pr
o
vid
e
a --r
e
m
e
rge-di
f
f capability
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
Elij
a
h
Newren
repo-setting
s
: rename th
e
tra
d
itional default
fetch
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
Elijah Newren
repo-settings: fix error handling for
u
n
k
nown values
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
Elijah Ne
w
ren
repo-settings:
fix
c
h
e
ck
i
ng
f
or fetch
.
n
e
g
otiationAlg
o
rith
m
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-01-28
Elijah Newren
spa
r
se-
c
heckout
:
f
ix a coupl
e
minor memory le
a
ks
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-01-26
Eli
j
ah Newr
e
n
sequence
r
, stas
h
:
fix running from wo
r
kt
r
e
e
subdir
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-01-21
Eli
j
ah Newren
merge: fix m
e
mory leaks in cmd_
m
er
g
e()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-01-21
E
l
ijah Newren
merge-ort:
fix memory
l
eak in merge_ort_internal()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-01-17
Elijah Newren
merge-ort: avoid ass
u
min
g
a
l
l
rena
m
e
s
detected
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-01-14
E
l
ijah New
r
en
Accele
r
a
t
e
cl
e
ar
_
skip_wor
k
t
re
e
_
from_present_files(
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-01-14
Elijah Newren
U
pda
t
e
d
ocumentation related to spars
i
ty
a
nd
t
he
s
kip
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-01-14
Elijah Newren
r
e
po_read_index: clear SKIP_WO
R
KT
R
EE bit from f
i
les
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-01-14
Elijah Newren
unpack-trees: fix acciden
t
al loss
o
f user changes
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-01-14
E
lij
a
h Newren
t1011:
add testcas
e
demonstrating accidental los
s
of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-01-04
Elij
a
h
Newren
stash: do not ret
u
rn before
r
estoring untra
c
k
ed files
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-30
Elija
h
Ne
w
ren
mer
g
e-ort: fi
x
bug wi
t
h renormaliza
t
ion
a
n
d
renam
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-23
Elijah Newren
sparse
-
c
h
e
ckout
:
remove str
a
y tra
i
li
n
g
space
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
Elijah Newren
clone:
a
void usi
n
g de
p
recated `s
p
arse-check
o
ut init`
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
Elijah New
r
en
Doc
u
ment
a
t
i
o
n: clar
i
f
y
/
c
orre
c
t a few s
p
arsit
y
related
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
Elija
h
Newren
git-spars
e
-check
o
ut
.
txt: update to document init
/
set
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
Elijah N
e
wren
sparse-
c
heckout: e
n
able reapply to take
--[no-]{cone
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
E
l
ijah Newren
sparse-checkout
:
enable
`se
t
`
t
o
i
nitia
l
ize sp
a
rse
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
Elijah Newren
spars
e
-
c
h
eckout:
spli
t
o
u
t
code
for tweaking settin
g
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
Elijah
N
ewr
e
n
spars
e
-che
c
kout
:
disallow --no-stdin
a
s
an arg
u
m
ent
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
Elijah New
r
en
sparse-checkou
t
: add sanity-checks on initial sp
a
rsity
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
Elijah
N
e
wren
sparse-ch
e
ck
o
ut: br
e
ak apart fun
c
t
i
ons for spa
r
s
e
_checkout_
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
El
i
jah Newren
sparse-checkout
:
pass use_st
d
in as a parameter i
n
s
tead
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
Elijah Newren
t2501: simplify the tests since
w
e can n
o
w
a
s
sum
e
desired
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
Elijah Newren
dir: ne
w
flag t
o
remove_dir_r
e
curse() to sp
a
re the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
El
i
jah Ne
w
ren
d
i
r:
avoid inci
d
entally removin
g
the original_cwd in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
Elijah Newr
e
n
stash: do not
a
ttempt to rem
o
ve startup_info->origin
a
l_cwd
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
Elijah Newren
rebase: do not attempt to remove startu
p
_i
n
f
o
->or
i
gin
a
l_c
w
d
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
Eli
j
ah Newren
cl
e
an: do not at
t
empt t
o
remove s
t
artu
p
_info->ori
g
inal_cwd
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
Elijah New
r
en
s
ym
l
inks: do not include startup_info
-
>original_cwd
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
Elijah Newren
un
p
a
ck-trees: add speci
a
l cwd handling
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
Elijah Newr
e
n
unpack-trees: refuse
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
setu
p
: introd
u
ce startup
_
info->orig
i
nal_cwd
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-09
Elij
a
h Newren
t2501:
a
dd various tests for
r
e
moving t
h
e current
w
orking
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-05
Elija
h
Newren
seq
u
e
ncer: do not expor
t
GIT_D
I
R and GIT_WORK_TREE
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-05
Elijah
N
ewr
e
n
name-rev
:
pre
f
er
s
ho
r
ter names
over
f
ollowing merges
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-01
E
l
ijah N
e
wren
update d
o
c
u
mentation for new
z
diff3 co
n
f
li
c
tStyle
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-11-30
Elijah
N
ewren
s
e
q
u
encer: avoid adding ex
e
c commands for non-commit
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-27
Elijah New
r
en
Docum
e
ntation: cal
l
out commands
t
h
at nuke
u
ntrac
k
ed
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-27
El
i
jah Ne
w
ren
Comment important codepat
h
s regarding nuking untracked
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-27
Elijah New
r
e
n
unp
a
c
k
-trees:
av
o
id nukin
g
untracked dir in
w
ay of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-27
Elijah N
e
wren
un
p
ack-trees: avoid
n
u
king untr
a
cked dir in way of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-27
E
l
i
jah Newr
e
n
C
hange
unpack_
t
rees
'
're
s
et' flag into an enum
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-27
Elijah Newren
Remove ign
o
red files
b
y
def
a
ult when th
e
y are
i
n
t
he way
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-27
Elijah New
r
e
n
u
npack-tree
s
:
m
ake dir an
i
nterna
l
-only struc
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-27
Elijah Newren
u
n
pack
-
trees: introduce pres
e
r
ve_ignor
e
d t
o
un
p
ack_t
r
ee
s
_options
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-27
Eli
j
ah Newren
r
e
ad-tree
,
merge
-
recu
r
siv
e
: o
v
erwr
i
te
ignored fi
l
es
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-27
Elijah Ne
w
ren
checkou
t
,
read-tree: fix
l
eak of unpa
c
k_
t
rees
_
options
.
dir
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-24
Elijah
N
ewren
t2500: add various tests for nu
k
i
n
g u
n
tracked files
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-20
El
i
j
a
h Newr
e
n
m
er
g
e-ort:
f
ix complet
e
ly wro
n
g com
m
en
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-20
Elijah Newren
trac
e
2
.
h:
fix trivial commen
t
typo
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-12
Elijah New
r
e
n
tests: remo
v
e leftove
r
untracked files
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-09-10
Elijah
N
e
wren
am: fix in
c
orrect e
x
it
s
tatus on am fail
t
o
abort
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next