repo.or.cz
/
git
/
debian.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
pack-objects: simplify --filter handling
2022-10-23
E
lijah Newr
e
n
merge-t
r
e
e
: support multipl
e
b
atched m
e
rges with -
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-10-23
Elijah N
e
wre
n
merge-t
r
ee
:
u
p
d
ate docum
e
ntatio
n
for differe
n
ces in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-10-22
Elijah Newren
merge
-
ort:
f
i
x
bug with dir
ren
a
me v
s
chang
e
dir t
o
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-09-02
Elijah Newren
diff: fix fi
l
terin
g
of merge co
m
mits under --remerge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-09-02
El
i
j
ah
N
e
wren
diff: fi
x
fil
t
e
r
ing of additi
o
n
al h
e
ad
e
rs und
e
r --
r
emerge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-09-02
El
i
jah Newren
d
iff: have
s
ubm
o
dule_
f
or
m
at logic avoid additional
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-08-26
E
lijah
Newre
n
t64xx: conve
r
t 'test_create_r
e
po' to 'git init'
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-08-24
Elijah Newren
t4301: add more interesti
n
g merge-tree tes
t
cases
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-08-24
Elijah Ne
w
ren
merge:
small code readability i
m
p
r
ovement
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-08-24
Elijah New
r
en
merge: cl
e
anup confusi
n
g logic f
o
r handling s
u
ccessful
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-08-24
E
lija
h
Newr
e
n
mer
g
e: only
a
p
p
ly autostash when appropriate
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-08-19
E
lijah N
e
wren
revision:
a
llow --ancestry-path to take
a
n
argu
m
ent
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-08-19
Elijah Newre
n
re
v
-list-options
.
tx
t
: fix
si
m
p
l
e
typo
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-08-19
E
l
ijah Newren
m
erge-ort:
r
emove
c
ode obsoleted by other change
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-08-18
Elijah Newren
merge-ort: pr
o
vide helpful submodule upda
t
e mess
a
g
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-08-18
Eli
j
ah Newren
m
e
r
ge-ort: a
v
o
id surpri
s
e with new sub_flag variable
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-08-18
Elijah Ne
w
ren
merge-ort: remov
e
translator lego in new "su
b
module
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-07-23
El
i
jah Ne
w
ren
me
r
ge: do not e
x
it
r
est
o
r
e
_sta
t
e(
)
prematu
r
ely
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-07-23
El
i
jah N
e
wre
n
merg
e
: ensure we
can actually restore pre-merge state
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-07-23
El
i
jah Newren
merge: mak
e
r
es
t
or
e
_
sta
t
e()
restor
e
sta
g
ed sta
t
e too
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-07-23
El
i
jah Newren
merge:
fix save_state() t
o
work when ther
e
are stat
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-07-23
Eli
j
ah Ne
w
ren
merge: do no
t
abort early if
o
ne strateg
y
fails to
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-07-23
Elij
a
h
Newren
merge: abort if index d
o
es not matc
h
HEAD fo
r
trivial
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-07-23
Elijah
Ne
w
ren
merge-
r
esolve
:
a
bort if index does not
m
atch HEAD
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-07-23
Elijah Newren
merge-ort-wrappers: ma
k
e printed messa
g
e mat
c
h
the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-07-06
Elijah Newren
me
r
ge-
o
rt: fix issue
with dua
l
r
e
name and ad
d
/add confli
c
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-07-06
Elijah
Newren
merge-or
t
: sh
u
ffle the computat
i
on
and cleanup of potential
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-07-06
Elijah Newren
me
r
ge-or
t
: make a sep
a
rate f
u
nction f
o
r
fre
e
ing s
t
r
uct
.
.
.
Signed-off-by:
Elijah Newren
<newren@palantir.com>
commit
|
commitdiff
|
tree
2022-07-06
Elijah Newren
merge-ort
:
sm
a
ll cleanu
p
s
o
f
c
h
e
c
k
_
for
_
d
i
r
e
ctory_rename
Signed-off-by:
Elijah Newren
<newren@palantir.com>
commit
|
commitdiff
|
tree
2022-07-06
E
lijah Newren
t6423: add tests
of d
u
al
d
i
rectory rena
m
e
plus add
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-07-01
Elijah Newren
t6429: fix use of no
n
-
e
xistent
f
unctio
n
Signed-off-by:
Elijah Newren
<newren@palantir.com>
commit
|
commitdiff
|
tree
2022-06-22
Elijah N
e
wren
gi
t
-
m
e
rge-tree
.
txt:
add a section o
n
potentional usage
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
Elijah N
e
w
ren
merg
e
-tree
:
add a --allow-unr
e
lated-histories flag
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
Elija
h
N
ewren
m
erge-tr
e
e: a
l
low `ls-files -u
`
style info
to be N
U
L
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
E
lijah Newren
m
e
rg
e
-ort: optionally produce mach
i
ne
-
re
a
d
a
b
le
o
utput
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
Elijah Newren
merge
-
ort:
s
tore mo
r
e specific confli
c
t inform
a
tion
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
El
i
jah Newre
n
me
r
ge-tree:
prov
i
de easy a
c
cess to `ls-file
s
-
u
` style
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
E
l
ijah Newr
e
n
m
e
rge-tree: p
r
o
v
ide a list
of which files
h
ave confli
c
ts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
Elijah Newren
merge-ort: re
m
o
ve
c
ommand
-
line-c
e
ntric s
u
bmodule message
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
Elijah Ne
w
ren
merge-
o
rt: provide a
merge_get_conf
l
i
c
ted_files() hel
p
er
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
Elijah Ne
w
ren
merge-tr
e
e: s
u
pport incl
u
ding m
e
r
ge messages in
ou
t
pu
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
Elijah Ne
w
ren
merge-or
t
:
s
p
li
t
out a sepa
r
ate display_up
d
ate_m
e
ssages
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
E
lijah Newren
merge
-
tree: implement real merges
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
Elijah New
r
en
merge-tree:
add option parsi
n
g
and in
i
tial s
h
ell for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
E
l
ij
a
h New
r
en
merge-tree: move log
i
c for
existing me
r
ge into new
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
Elijah N
e
wren
merge-tree: rename
m
e
r
ge_tre
e
s() to
tr
i
via
l
_merge_trees()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-04-22
Elijah Newren
Docum
e
ntatio
n
: some
sparsity wording clari
f
i
c
a
tio
n
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-04-22
Elijah N
e
wren
git
-
sparse-checkout
.
txt: mark no
n
-cone mode as
d
epre
c
ated
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-04-22
E
l
ijah N
e
wren
git-sparse-checkout
.
tx
t
: flesh
out pattern se
t
s
e
ctions
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-04-22
E
lijah
N
ewren
git-
s
parse-c
h
e
c
kout
.
txt: add a new EX
A
MPLE
S
sectio
n
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-04-22
E
li
j
ah Newren
git-
s
p
arse-checkout
.
txt: shuf
f
l
e s
o
me sect
i
ons a
n
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-04-22
E
l
i
jah Newren
g
it-sparse-che
c
kout
.
txt:
update docs for deprecation
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-04-22
Elijah Newren
git-sparse-checkout
.
tx
t
: w
o
r
d
ing up
d
a
t
es for th
e
cone
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-04-22
Elijah
N
ewren
spar
s
e-checkout: ma
k
e --cone
the d
e
fau
l
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-04-22
Elijah N
e
wren
t
ests
:
s
top assuming -
-
no-cone is
t
he d
e
fault m
o
de
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-03-02
Elijah Newren
repo_read
_
i
ndex: add
c
onfig to expect f
i
les ou
t
s
i
de
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-03-02
Elijah Newren
merge-o
r
t: exclude messages f
r
om inner m
e
rg
e
s by
d
e
f
ault
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-20
Elijah
Newre
n
mer
g
e
-
ort: f
i
x small memory
leak
in unique_path()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-20
El
i
jah Newren
m
erg
e
-
o
rt: fix sm
a
ll memory lea
k
in detect_and_process_re
n
ames()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-20
Elijah Newren
spars
e
-ch
e
ckout: rej
e
ct argu
m
ents in
c
one-mode that
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-20
Elij
a
h Newren
sparse-checkou
t
: error or warn when given
i
ndivid
u
al
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-20
Eli
j
ah N
e
wren
sparse
-
che
c
kout: pay att
e
ntion
t
o prefix for
{set,
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-20
Elijah Newren
sparse-chec
k
out:
c
orrec
t
l
y
se
t
non-cone mod
e
whe
n
expected
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-20
Elija
h
Newren
sparse-c
h
eckout: co
r
re
c
t reapply's handling of o
p
tions
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-17
El
i
jah Newren
merge-ort: m
a
ke informational me
s
sage
s
f
r
o
m recursive
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
Elijah Newren
diff
-
mer
g
es: avoid history simpl
i
fications w
h
en
diffing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
Elijah Newren
mer
g
e-ort:
mark conf
l
ic
t
/w
a
rning messages fr
o
m
i
nner
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
E
l
ijah
N
ewren
show, log: in
c
lu
d
e co
n
flict/wa
r
n
i
n
g messag
e
s in
-
-
reme
r
ge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
El
i
j
ah Newren
dif
f
: add ability to insert addit
i
on
a
l header
s
f
or
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
Elijah New
r
en
merge-ort
:
f
o
r
mat messages sli
g
h
tly differen
t
for use
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
Elijah Newren
m
e
rge-ort: mark a few more conflict
m
essages a
s
omittable
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
E
l
ijah New
r
en
merge-ort
:
cap
t
ur
e
and
p
rin
t
l
l-mer
g
e warnings
in o
u
r
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
Elijah Newren
ll-mer
g
e
:
make callers responsible f
o
r
s
howing warnings
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
Elijah New
r
e
n
log: c
l
ean unneeded ob
j
ects during `log --reme
r
ge-diff`
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
E
lij
a
h
N
ewren
s
h
ow,
l
o
g:
provide a --remerge-diff ca
p
abil
i
t
y
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
Elijah Newren
repo-
s
etting
s
: rename the traditional default fetch
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
E
lijah Newre
n
repo-settings: fix err
o
r handling for unknown
v
alues
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
El
i
jah Newren
r
epo-settings: f
i
x c
h
ecking for fetch
.
negotiationAl
g
orithm
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-01-28
Elij
a
h Newren
sparse-checkout: fix
a couple min
o
r memory lea
k
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-01-26
Elijah
N
ewren
sequencer
,
stash: fix r
u
nnin
g
from worktree s
u
b
dir
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-01-21
Elijah
N
e
wren
mer
g
e: f
i
x memory leaks
i
n
c
md_m
e
rg
e
(
)
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-01-21
El
i
jah Newren
merge-ort: fix mem
o
ry leak in m
e
rge_ort_
i
nternal()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-01-17
E
lijah Newren
merg
e
-ort:
avoid a
s
sum
i
ng all renames detec
t
ed
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-01-14
Elijah N
e
wren
Accelera
t
e clear_skip_worktree_from_prese
n
t_fi
l
e
s(
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-01-14
Elijah Newren
Update docum
e
n
t
ati
o
n relate
d
to sparsity and the skip
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-01-14
Elija
h
Newren
repo_read_index: clear SKIP_WO
R
KTRE
E
b
i
t
f
r
o
m files
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-01-14
E
l
ija
h
Newren
unpack-tre
e
s:
f
ix accide
n
t
a
l loss of use
r
changes
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-01-14
Elijah Newren
t
1
0
11
:
a
d
d testcase demo
n
strating accide
n
tal loss of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-01-04
Elijah Newren
s
t
ash: do
n
o
t return b
e
fore
r
estoring untra
c
ked file
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-30
Elijah N
e
wren
m
e
rge-ort: fix bug
with r
e
normal
i
za
t
ion and ren
a
me
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-23
Elijah Newren
sparse-checkout: remov
e
stray t
r
ailing space
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
Elijah Ne
w
ren
clone: avoid using
deprecated
`
sparse-checkout init`
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
E
l
ijah New
r
en
Documentat
i
on: c
l
arify/correct a
few spa
r
s
ity related
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
Elija
h
Newren
git-sparse-checkout
.
tx
t
: update to do
c
u
m
en
t
init/set
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
Elijah New
r
en
spa
r
se-checkout: enable reapply to tak
e
-
-[
n
o-
]
{cone
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
Elijah Newren
sparse-che
c
k
out: enable `
s
et` to
i
n
i
tialize sparse
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
Elijah
Newren
sparse-checkout: split out cod
e
for tweaking
s
etti
n
gs
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
Elijah Newren
s
p
arse-c
h
e
c
kout: disallow --no-s
t
din as an argument
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
Eli
j
a
h
Newren
spa
r
se-check
o
ut: add san
i
ty-checks
o
n initial sparsity
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2021-12-15
Elijah Newren
s
parse-chec
k
out
:
break apa
r
t functio
n
s
for
s
p
ars
e
_chec
k
out_
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next