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
dir: add a usage note to exclude_per_dir
2023-02-27
Eli
j
ah
N
e
w
ren
d
ir: a
d
d
a
u
sage note to excl
u
de_pe
r
_dir
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2023-02-27
Elijah Newren
dir: separate
p
u
blic from in
t
ernal
por
t
ion of dir
_
struct
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2023-02-27
E
lij
a
h Newren
unpack
-
trees: heed requests to ov
e
rw
r
ite ignored f
i
les
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2023-02-27
Elijah New
r
e
n
t2021: fix pla
t
form-spe
c
ifi
c
leftov
e
r cruft
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2023-02-09
Elija
h
N
e
w
ren
name-re
v
: fix names
b
y
dr
o
pping tagger
d
at
e
workaround
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2023-01-25
Elijah Newren
rebase
:
provide better error message for
a
pply
o
ptions
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2023-01-25
E
l
ijah N
e
wren
reb
a
se: put
r
eb
a
s
e
_opti
o
ns initialization
i
n
single
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2023-01-25
Elij
a
h Newr
e
n
rebase: fix formatti
n
g
of
reba
s
e
--reappl
y
-c
h
erry-picks
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2023-01-25
El
i
jah
Newre
n
r
e
b
a
se
:
cl
a
rify
t
he OPT_CMD
M
ODE i
n
c
o
mpatibilities
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2023-01-25
Elijah Newren
rebas
e
:
ad
d
coverage
of other incom
p
atible
o
p
t
ions
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2023-01-25
E
lijah N
e
wr
e
n
rebase: f
i
x
i
ncompatibl
i
ty checks
for --
[
n
o-]reapply
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2023-01-25
E
lijah Newren
rebase: fi
x
doc
s
about incom
p
atibilities w
i
th --root
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2023-01-25
Elijah Newren
reba
s
e:
r
e
m
ov
e
--allow-empty-messag
e
from in
c
omp
a
tible
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2023-01-25
E
l
i
j
ah Newren
re
b
ase: flag --app
l
y and --merge as incompatible
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2023-01-25
Elijah Newren
re
b
ase:
m
ark --update
-
refs as
requ
i
rin
g
the merge
b
ackend
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2023-01-15
Elij
a
h New
r
en
t6426: fix
TODO
abou
t
makin
g
t
e
s
t
more
c
o
mprehensive
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2023-01-13
Elijah Newren
ls-files: guide folks to --exclude-stan
d
a
r
d ove
r
other
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2023-01-13
Elijah Newren
l
s
-files: clarify
descripti
o
n
s of
status tags for
-t
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2023-01-13
El
i
jah
N
e
wre
n
ls-files: clarify
d
escription
s
of
f
ile selection
o
p
t
ions
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2023-01-13
E
lijah Ne
w
ren
ls-files:
a
dd mis
s
ing documentati
o
n for --res
o
lve-u
n
do
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-11-07
El
i
jah Newren
spa
r
se-checkout
.
t
x
t
: new document with s
p
a
r
se-chec
k
out
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-10-23
Eli
j
ah Newren
merge-tree: support mu
l
tiple batched merg
e
s with
-
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-10-23
Elijah Newren
merge-tree: upd
a
te docu
m
entation for differences in
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-10-22
El
i
j
ah Newren
m
erge-ort:
fix
bug wit
h
dir rename vs
c
hange dir to
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-09-02
Elijah
N
ewren
d
iff: fix filter
i
n
g
of
m
erg
e
commits unde
r
--remerge
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-09-02
Elijah Ne
w
ren
d
i
ff: fix filterin
g
of additio
n
al headers u
n
d
er --r
e
merge
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-09-02
E
lijah Newren
diff: ha
v
e submodule_format logic avoid additio
n
al
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-08-26
El
i
jah Newren
t64xx: conve
r
t
'
test_create_repo
'
to 'git
init'
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-08-24
E
l
ijah
N
e
wren
t4
3
01:
add more int
e
resting m
e
rge-t
r
ee
t
estcases
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-08-24
E
l
ijah New
r
en
mer
g
e: sma
l
l
c
o
de r
e
adability im
p
rovement
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-08-24
Elijah Newren
merge: cleanup c
o
nfusing
logic for
h
andling successful
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-08-24
Elijah Newren
merge: onl
y
apply a
u
tostash wh
e
n appropr
i
a
te
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-08-19
Elijah Newren
r
e
visi
o
n:
allow --ancestry-path to ta
k
e
an argum
e
n
t
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-08-19
E
lijah Newren
rev-list-options
.
t
xt: fi
x
si
m
ple typo
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-08-19
Elijah Newren
merge-ort: remove code obsoleted by other changes
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-08-18
Elijah Newren
merge-ort: prov
i
de helpful submodule update m
e
s
sage
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-08-18
Elijah Newr
e
n
merge-or
t
:
a
void surp
r
ise with new
sub_f
l
ag variable
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-08-18
E
l
i
jah Newren
mer
g
e-ort: rem
o
ve translator
l
ego in new "submodule
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-07-23
E
l
i
jah N
e
wr
e
n
me
r
ge: do n
o
t e
x
it
res
t
ore_state() prematu
r
ely
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-07-23
Elijah Ne
w
ren
merge
:
ensur
e
w
e
c
an a
c
tua
l
l
y
r
e
stor
e
pre-merge state
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-07-23
El
i
jah Newr
e
n
merge: ma
k
e restore_state() re
s
tore stage
d
sta
t
e too
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-07-23
Elijah Newren
mer
g
e: f
i
x save_sta
t
e() to w
o
rk when there
a
re stat
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-07-23
El
i
jah Newren
me
r
ge: do not ab
o
rt early if one str
a
tegy fail
s
to
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-07-23
Eli
j
ah Newr
e
n
mer
g
e: abort if ind
e
x does not match
H
EAD for tr
i
vial
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-07-23
Elija
h
New
r
en
merge-resolv
e
:
abort if index do
e
s not m
a
tch H
E
A
D
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-07-23
Elijah Ne
w
ren
merge-ort-wrappers: ma
k
e p
r
inted m
e
ssag
e
mat
c
h the
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-07-06
Elijah Newren
merge-o
r
t: fix iss
u
e with
dual rename and add/ad
d
conflict
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-07-06
Elijah N
e
wren
merge-or
t
: sh
u
ffle the c
o
mputation and cleanup of potential
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-07-06
Elijah Ne
w
ren
t64
2
3: ad
d
tests of dual directory rename plus a
d
d
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-06-22
Elijah Newren
gi
t
-merge-tre
e
.
txt
:
add a sec
t
ion on po
t
ent
i
onal us
a
ge
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-06-22
E
l
i
j
ah Newren
merge-tree: add a
-
-allo
w
-unrelate
d
-histories flag
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-06-22
Elijah
Ne
w
ren
me
r
ge-tree
:
a
llow `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 N
e
wren
merge-or
t
: option
a
lly produce machine-readable output
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-06-22
E
l
ijah New
r
en
merge-ort: store more
spe
c
ific confli
c
t information
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-06-22
Elijah Newren
m
e
r
g
e-tree: provid
e
easy
acce
s
s
to
`
l
s-files -u` style
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-06-22
Elijah N
e
wren
me
r
ge-tre
e
: p
r
ovide a li
s
t of
w
h
i
ch files
have
confli
c
t
s
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-06-22
Elijah Newren
m
erge-ort:
r
emove c
o
m
mand
-
line-centric subm
o
dule messa
g
e
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-06-22
E
l
ijah Newren
m
e
rge-or
t
:
provide a merge_ge
t
_
c
onf
l
ic
t
ed_files() he
l
per
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-06-22
E
lijah Newren
merge-tree:
s
u
ppo
r
t including merge
messa
g
es in ou
t
p
u
t
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-06-22
Elij
a
h Newren
merge-
o
rt: split o
u
t
a
separate
display
_
upd
a
te_me
s
sages
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-06-22
Elijah Newr
e
n
merge-tree: implement real merges
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-06-22
Elij
a
h Newren
merge-tree: add optio
n
parsing and ini
t
i
a
l shell for
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-06-22
Elijah Newren
me
r
ge
-
tree: mov
e
logic fo
r
existi
n
g
merge into new
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-06-22
E
lijah
N
ewr
e
n
mer
g
e-tree: rename merge_tre
e
s
() to trivial_merge_trees()
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-04-22
Elija
h
Newren
Documentation: some sparsity
w
ording clarifications
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-04-22
Elijah Newren
gi
t
-
spa
r
s
e
-
checko
u
t
.
tx
t
: mark non-cone mode as depr
e
cated
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-04-22
Elija
h
Newren
git-sparse-chec
k
out
.
tx
t
: flesh out pattern set secti
o
ns
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-04-22
Elijah New
r
en
git-sparse-check
o
ut
.
txt: add a new
E
XA
M
PLES se
c
tion
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-04-22
Elijah Ne
w
ren
g
i
t-
s
parse-checkou
t
.
txt: shuffle some
s
ecti
o
n
s an
d
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-04-22
Elijah Newren
g
i
t
-
sparse-
c
h
e
c
kout
.
txt: update d
o
cs for depre
c
ation
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-04-22
Elijah
N
e
wren
gi
t
-
sparse-check
o
ut
.
txt: wor
d
ing
u
pdates f
o
r the cone
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-04-22
E
l
ijah Newren
sparse-check
o
u
t
: make --cone th
e
defaul
t
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-04-22
Elijah Newren
t
ests: st
o
p as
s
uming
--no-co
n
e is t
h
e default mode
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-03-02
Elijah Newren
repo_read
_
index: add config to e
x
p
e
ct
files outs
i
de
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-03-02
Elijah
Newren
merg
e
-
or
t
: exclude message
s
f
rom inner
m
erg
e
s by default
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-02-20
E
l
i
j
ah Newren
merge-ort: fix small memory
leak in u
n
ique_
p
a
t
h()
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-02-20
Elijah Newren
merge-or
t
: fix
s
m
all memory leak in
detect_and_proces
s
_renames()
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-02-20
Elijah
Newren
sparse-checkout: reje
c
t
argu
m
e
nts in cone-mode that
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-02-20
E
l
ija
h
Newren
s
p
a
rs
e
-checkout: error or warn when given
i
ndividual
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-02-20
E
l
ijah Ne
w
ren
sparse-checkout: pay attention
to prefi
x
f
o
r {s
e
t,
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-02-20
E
l
i
j
ah New
r
en
s
p
ars
e
-
c
he
c
k
out: corre
c
tly s
e
t non-cone mode when ex
p
ected
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-02-20
Elijah
N
ewre
n
s
p
arse-che
c
kout:
c
orrect reapply's h
a
ndlin
g
of options
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-02-17
Elijah Newren
merge-ort: make informational messages from
recursive
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-02-02
Eli
j
ah Newren
diff-merges
:
av
o
id history simplificat
i
o
ns when di
f
fing
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-02-02
Elij
a
h Newren
me
r
ge-ort
:
mark
c
o
nflict/warning me
s
s
ages
f
rom inner
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-02-02
E
lijah Ne
w
ren
show, l
o
g: include confli
c
t/warning messag
e
s in
-
-rem
e
rge
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-02-02
Elijah New
r
e
n
diff:
add abili
t
y
t
o insert addit
i
onal headers for
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-02-02
Elijah
N
ewre
n
me
r
ge-ort: forma
t
messages slightly different f
o
r use
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-02-02
Elijah New
r
en
merge-ort:
m
ark a few m
o
re conflic
t
messa
g
es
as
omittable
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-02-02
Elijah
Newren
merge-ort
:
capture
a
nd print
l
l-merge warnin
g
s
i
n o
u
r
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-02-02
Elijah
Newren
ll-merge: make cal
l
ers
r
e
sponsible for showing war
n
ings
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-02-02
E
l
ij
a
h
Newren
l
o
g: clean un
n
eeded ob
j
ect
s
during `log --remerge-
d
iff`
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-02-02
Elijah Ne
w
ren
show, log: pro
v
i
de a -
-
remerge
-
d
iff capability
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-02-02
El
i
jah Newren
repo-set
t
ings: rename the tradi
t
ion
a
l
d
efault fetch
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-02-02
E
l
ij
a
h
Newr
e
n
re
p
o-s
e
ttin
g
s: fix err
o
r ha
n
dling for unknown
v
a
l
ues
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-02-02
Eli
j
ah New
r
en
repo-s
e
ttings: fix checki
n
g
for f
e
t
c
h
.
neg
o
tiationAlgo
r
i
t
h
m
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-01-28
Eli
j
ah Ne
w
ren
sparse-check
o
ut: fix a co
u
ple
min
o
r
memory le
a
ks
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-01-26
Elija
h
Newren
sequence
r
, sta
s
h:
f
ix
r
unning
from
worktree subdi
r
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-01-21
Elij
a
h New
r
en
merge:
f
ix mem
o
ry leaks in cmd_merge()
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2022-01-21
Eli
j
ah Newren
merge-ort: fix mem
o
ry l
e
ak in merge_ort_inte
r
nal()
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
next