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
rebase: add documentation and test for --no-rebase-merges
2023-02-27
Elijah Newren
unp
a
ck-t
r
ees: add us
a
g
e n
o
t
ices around
d
f
_conflict_e
n
try
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-02-27
Elijah Newren
unpack-trees: s
p
ecial ca
s
e
r
ead-tree
d
ebugging as inter
n
al
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-02-27
Elijah Newren
u
n
pack-t
r
ees: rewrap a few overlong line
s
from previous
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-02-27
Elija
h
Newre
n
unpa
c
k-trees:
mark fiel
d
s only used internall
y
a
s
i
nternal
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-02-27
Elijah
Newren
unpack_
t
rees: start
splitting interna
l
f
i
elds from
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-02-27
Elijah
N
e
w
ren
s
p
ars
e
-
c
h
eckou
t
:
avoid
using
i
n
ternal API of un
p
ack
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-02-27
E
lijah N
e
wren
spar
s
e-chec
k
o
ut: avoi
d
using internal
API of
u
n
pack
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-02-27
Elijah Newren
u
n
pack-tre
e
s
:
clean
up some flow
con
t
rol
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-02-27
Elijah Newren
dir: m
a
rk out
p
ut only
field
s
of d
i
r_struct
as such
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-02-27
E
l
ijah Newren
dir: add a usa
g
e note
to excl
u
de_per_dir
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-02-27
Elijah New
r
e
n
dir: separate public from internal portion
o
f dir_s
t
ruct
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-02-27
Elijah Ne
w
ren
unpack-tree
s
: heed
requests to overwrite igno
r
e
d
file
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-02-27
Elijah Newren
t2021: fix pla
t
for
m
-speci
f
ic
l
eftov
e
r c
r
uft
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-02-24
Elijah N
e
wren
d
i
ff
.
h: rem
o
ve
unnec
e
ssary include of object
.
h
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-02-24
Eli
j
ah Newren
Remove unnecessa
r
y
includes of builtin
.
h
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-02-24
E
lijah Newr
e
n
treewide: replace cache
.
h with more dire
c
t headers
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-02-24
Elijah
N
e
wren
replace-object
.
h: move read_repl
a
ce
_
refs declara
t
i
o
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-02-24
E
l
ijah Newren
object-store
.
h
:
move struct object_i
n
f
o
f
rom cache
.
h
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-02-24
Elijah Newren
dir
.
h
:
refactor to
n
o longer need to i
n
clude cache
.
h
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-02-24
Elijah
N
ewren
o
b
ject
.
h
: st
o
p depending on ca
c
h
e
.
h; make cache
.
h depend
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-02-24
Elijah New
r
en
ident
.
h: move ide
n
t-r
e
la
t
ed d
e
clarations out of cache
.
h
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-02-24
E
l
ijah
Newren
pretty
.
h: mov
e
has_non_ascii() declaration from commit
.
h
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-02-24
Elijah Newre
n
ca
c
he
.
h: r
e
move depend
e
nce on hex
.
h;
m
ake other files
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-02-24
E
l
ijah Newre
n
h
e
x
.
h: m
o
v
e some hex
-
rel
a
ted declarat
i
ons
f
rom cache
.
h
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-02-24
Elijah Newren
hash
.
h:
move some oid-
r
elated
de
c
l
a
rations
fr
o
m cache
.
h
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-02-24
Elijah
N
ewre
n
alloc
.
h: mov
e
A
L
LO
C
_GROW()
func
t
i
o
ns from
c
ac
h
e
.
h
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-02-24
El
i
jah
N
ewren
treewide:
r
emove
unnecessary cache
.
h includes in source
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-02-24
Elijah Newren
treewide
:
remove unn
e
cessary cache
.
h includes
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-02-24
Elijah Newren
treewide
:
remove unnecessary git-compat-u
t
i
l
.
h includes
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-02-24
Elijah New
r
en
treewi
d
e: ensure one
o
f the appropriate
h
eader
s
i
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-02-09
Elijah New
r
en
name-rev: fix nam
e
s b
y
dropp
i
ng taggerdate worka
r
ound
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-01-25
E
l
ijah Newren
r
ebase: provide be
t
ter error m
e
s
s
a
g
e for
apply options
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-01-25
Elijah Newr
e
n
rebase:
p
ut r
e
base_o
p
tio
n
s init
i
aliza
t
io
n
in singl
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-01-25
Elij
a
h
Newren
r
e
base: fix formatting of rebase
-
-reap
p
ly-
c
h
erry-picks
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-01-25
E
l
i
j
ah Newre
n
reba
s
e: clari
f
y the OPT
_
CMDMODE incompatibilities
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-01-25
El
i
j
ah Newren
rebase:
a
dd coverage of other i
n
compatible op
t
i
ons
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-01-25
Eli
j
ah Ne
w
ren
rebase
:
f
i
x inc
o
mpatib
l
i
t
y
c
hecks for --[no-]reapply
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-01-25
Elijah Newren
rebase: fi
x
d
ocs about
incomp
a
tibilitie
s
with --root
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-01-25
Elijah N
e
wre
n
rebase: re
m
ove --allow-empty-
m
es
s
age fro
m
incompatible
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-01-25
Elijah N
e
wren
re
b
a
s
e: flag --apply
a
n
d --merg
e
as inc
o
mpatible
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-01-25
Elijah
N
ewren
rebase:
m
ark --update
-
refs as requiring the merge backend
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-01-15
Elijah Newre
n
t
6
4
26
:
fix TOD
O
about making test mor
e
compr
e
hensive
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-01-13
Elij
a
h Ne
w
ren
ls-files: guid
e
fo
l
k
s to
-
-e
x
clude
-
stand
a
rd over
other
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-01-13
Elijah Newren
ls-files: clarify descriptions of
status
tags for -t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-01-13
E
l
ijah Ne
w
r
e
n
ls-files: clari
f
y descript
i
ons of
f
ile s
e
lection options
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-01-13
Elijah Newren
ls-fi
l
es: add mis
s
in
g
do
c
umentation for --resolve-undo
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-11-07
Elijah Newren
sparse-checko
u
t
.
t
x
t: n
e
w document
wi
t
h
sparse-checkout
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-10-23
E
li
j
ah New
r
en
merge-
t
ree: sup
p
ort mul
t
iple
b
atched merges with -
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-10-23
Eli
j
ah New
r
en
merg
e
-tree: upda
t
e docu
m
entati
o
n
for
d
ifferences in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-10-22
Elija
h
Newren
merge
-
ort: fix bug with dir rename vs change d
i
r to
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-09-02
Elija
h
Newren
diff: fix fi
l
tering of
m
e
rge c
o
mmits under --remerge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-09-02
El
i
jah Newren
diff: fix filteri
n
g of additional headers u
n
der
-
-remer
g
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-09-02
Elijah Newren
d
i
ff: hav
e
submodule_f
o
rmat
logic
av
o
i
d ad
d
itio
n
al
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-08-26
Elijah N
e
wren
t64xx
:
con
v
ert 'test_crea
t
e_r
e
po' to 'git
i
n
i
t'
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-08-24
Elijah Newren
t4301: add more
i
nteres
t
ing merg
e
-
t
r
e
e t
e
s
tcases
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-08-24
E
l
i
jah Newren
mer
g
e: smal
l
code readabili
t
y
improvem
e
nt
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-08-24
Elijah N
e
wren
merge: cleanup co
n
fusing
log
i
c for handl
i
ng s
u
ccessful
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-08-24
Elijah Newren
mer
g
e
: only a
p
p
l
y autostash when appropri
a
te
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-08-19
Elijah Newren
rev
i
sion: allow -
-
ancestry-pat
h
t
o
t
ake an arg
u
ment
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-08-19
Elijah
N
e
w
ren
rev-list-
o
ptions
.
t
x
t: fix si
m
p
l
e typo
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-08-19
El
i
jah Newre
n
merge-ort
:
r
emove
c
ode obsoleted by other changes
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-08-18
Elijah Newren
merge-ort
:
pro
v
ide helpful submo
d
ule up
d
ate message
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-08-18
Elijah Newren
merg
e
-ort: avoid
s
u
r
prise with
ne
w
sub_flag variab
l
e
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-08-18
E
l
ija
h
Newren
merge-ort: remove tra
n
slat
o
r l
e
go in new "subm
o
dule
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-07-23
E
lijah Newr
e
n
merge: do not exit restore_state() pr
e
m
a
turely
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-07-23
Elijah Newren
m
erge:
e
nsure we can ac
t
ua
l
l
y
restore
p
re-m
e
r
ge st
a
t
e
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-07-23
Elijah Newren
m
e
rge: make re
s
tore
_
state() r
e
store staged
s
tate
t
oo
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-07-23
Elijah Newren
merge
:
fi
x
save_state() to w
o
rk w
h
en there ar
e
stat
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-07-23
Elijah
N
ew
r
en
merge:
d
o not abort ear
l
y if o
n
e s
t
rategy
f
a
ils to
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-07-23
E
l
ij
a
h New
r
en
merge: abort if
inde
x
does not match HEAD for t
r
iv
i
a
l
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-07-23
Elijah N
e
wr
e
n
m
e
rge
-
reso
l
ve: abort i
f
index do
e
s
not m
a
tch HEAD
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-07-23
E
lijah Ne
w
ren
me
r
ge
-
ort-wrappers: mak
e
printed message match the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-07-06
Elijah
N
e
wr
e
n
merge-ort: fi
x
issue with dual rename and add
/
a
d
d c
o
nflict
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-07-06
E
l
ijah Newren
merge-ort: shuffl
e
t
he computation and cleanu
p
of potential
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-07-06
Elijah Newren
merge
-
ort: m
a
k
e a separate
fun
c
tion for freeing struct
.
.
.
Signed-off-by:
Elijah Newren
<newren@palantir.com>
commit
|
commitdiff
|
tree
2022-07-06
Elija
h
Newren
me
r
ge-
o
rt
:
sm
a
ll cleanup
s
of check
_
for_directory_re
n
ame
Signed-off-by:
Elijah Newren
<newren@palantir.com>
commit
|
commitdiff
|
tree
2022-07-06
Elijah
N
ewren
t6423
:
add tests of dual directo
r
y rename plus add
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-07-01
E
lijah Newren
t6429: fix use
of non-existent function
Signed-off-by:
Elijah Newren
<newren@palantir.com>
commit
|
commitdiff
|
tree
2022-06-22
Eli
j
a
h
Newren
git
-
merge-t
r
ee
.
txt: add a section on
po
t
ention
a
l
usag
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
Elijah
Ne
w
ren
merge-t
r
ee: add a --allow-unrelated-hi
s
t
o
ries flag
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
Elijah
Newren
merge-tree: allow
`
l
s-
f
iles -u
`
style info to b
e
NUL
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
Elijah Newren
merge-ort:
optionally
p
roduce
m
a
c
hine-readab
l
e ou
t
pu
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
E
l
ijah Newren
merge-ort: st
o
re more s
p
ecific conflict informati
o
n
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
E
l
ij
a
h Newr
e
n
merge-tree: pro
v
ide easy access to `ls
-
files -u` style
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
Eli
j
ah Newren
mer
g
e-tr
e
e: prov
i
de
a
list of which files have conflicts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
Elijah Newren
me
r
ge-o
r
t:
remove
command-line-centric su
b
modu
l
e message
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
Elijah N
e
wr
e
n
merge-ort: prov
i
de a m
e
r
g
e_get_con
f
licte
d
_files(
)
help
e
r
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
Elijah New
r
en
m
e
r
g
e-tre
e
: support inclu
d
in
g
mer
g
e me
s
sages in output
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
E
lijah Ne
w
ren
mer
g
e
-ort: split out a separate disp
l
ay_update_messages
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
Elijah Newr
e
n
merge-t
r
ee:
im
p
l
eme
n
t r
e
al merges
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
El
i
jah Newren
merge-tree:
add option pars
i
ng a
n
d initial shell for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
E
l
ijah Newren
merge-tree:
move l
o
gic for
e
xisting merge into new
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
Elija
h
N
e
wren
merge-tr
e
e: r
e
name merge_tree
s
() to tr
i
v
ial_merge_trees()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-04-22
Elijah Ne
w
ren
Documentation: some
s
parsity
word
i
ng c
l
arific
a
tions
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-04-22
Elijah N
e
wre
n
git-sparse-
c
hecko
u
t
.
txt: mark
n
on-cone mode as deprecat
e
d
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-04-22
Elijah Ne
w
ren
git-sparse
-
chec
k
ou
t
.
txt: f
l
esh out patt
e
r
n s
e
t sections
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-04-22
E
lijah
N
e
w
r
en
git-sparse-checkou
t
.
t
xt: add
a
n
ew E
X
A
M
P
LES section
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-04-22
Elij
a
h
N
ewren
g
i
t-sparse-checko
u
t
.
txt: s
h
uffle
some sections and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-04-22
Elijah Newren
gi
t
-sparse-checkout
.
t
x
t
:
upd
a
te docs f
o
r deprecation
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-04-22
Elijah
New
r
e
n
git-spa
r
se-ch
e
ckout
.
txt: w
o
rding upd
a
tes for
the cone
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next