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
split-index: accept that a base index can be empty
2023-02-09
E
lijah Newren
n
a
me-rev: fix names by dro
p
ping tag
g
erdate worka
r
o
un
d
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-01-25
Elij
a
h Newren
rebase:
provide
b
etter e
r
ror message for apply option
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-01-25
Elijah
Ne
w
re
n
rebase: put reba
s
e_options initia
l
ization in s
i
n
g
le
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-01-25
Elijah Newren
reb
a
se: f
i
x formatting of reba
s
e --reap
p
ly-cherry
-
picks
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-01-25
Elijah
Newren
rebase: clarify the OPT_CM
D
MODE
in
c
om
p
atibilities
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-01-25
Elijah Newren
r
e
base
:
add covera
g
e of other
i
ncompatibl
e
options
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-01-25
Elijah Newren
rebase: fi
x
in
c
o
mpatiblity checks for
--[no-]r
e
ap
p
ly
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-01-25
Elijah New
r
en
rebase: f
i
x docs
ab
o
ut incompat
i
bilities with --root
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-01-25
Elijah Newren
reba
s
e: remove --allow-emp
t
y
-m
e
ssage
from inco
m
p
a
tible
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-01-25
E
lijah New
r
en
rebase: flag --apply
a
n
d --merge
as incom
p
atible
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-01-25
E
lijah New
r
en
re
b
ase:
m
ark --
u
pdate-refs as requiring the me
r
ge
b
ack
e
nd
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-01-15
Eli
j
ah
N
ewren
t6426:
f
ix
T
ODO about
m
a
k
ing test more comp
r
e
hensive
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-01-13
Elijah N
e
wren
l
s-files: guide folks to --exclude-sta
n
dard over oth
e
r
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-01-13
El
i
j
a
h Newren
ls-fi
l
es:
c
lari
f
y des
c
riptions of
status
t
ags f
o
r -t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-01-13
E
lij
a
h
Newren
l
s
-files: c
l
arify descripti
o
ns of
fil
e
select
i
on opti
o
ns
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-01-13
Elijah N
e
wre
n
ls-
f
iles: ad
d
m
issing documentation for
--
r
esolve-undo
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-11-07
Elijah Newren
sparse-chec
k
o
u
t
.
txt
:
new document with
s
parse-checkout
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-10-23
E
l
ijah
Newren
m
erge-tree: support multiple
batch
e
d
merges w
i
t
h -
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-10-23
E
lijah New
r
en
merge-tree: update doc
u
m
entati
o
n
for differences in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-10-22
E
l
ijah Newren
merge-ort: fix
bug with dir renam
e
vs cha
n
ge dir
to
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-09-02
Eli
j
ah
New
r
en
diff: fix f
i
ltering o
f
me
r
ge commits under
--reme
r
g
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-09-02
Elij
a
h N
e
w
ren
diff: fix
filtering of additional headers under --remerg
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-09-02
Elijah Newr
e
n
diff: have su
b
module_form
a
t logic avoid addit
i
o
nal
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-08-26
Elija
h
Newren
t6
4
xx: convert 'test_create_repo' to '
g
it init'
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-08-24
Elijah New
r
en
t4301: add mo
r
e inte
r
e
sting
merg
e
-tree testcases
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-08-24
E
lija
h
Newren
merge
:
small code readability improve
m
ent
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-08-24
Elija
h
New
r
e
n
merge: cleanup confusing logic fo
r
handling succe
s
sful
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-08-24
E
lijah Newren
merge: only apply autostash when appropriate
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-08-19
Elija
h
N
ewren
revision:
a
llow --ancestry-path
t
o t
a
ke an argument
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-08-19
Elijah Newren
rev-list-opt
i
ons
.
txt:
fix simple typo
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-08-19
Elij
a
h Newren
merge-ort: remove code obs
o
le
t
ed by
ot
h
er changes
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-08-18
Elijah Newren
merge-ort: provid
e
help
f
ul submod
u
le upda
t
e mess
a
ge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-08-18
Eli
j
ah Newren
merge-ort: avoid
s
urpris
e
with new
s
ub_fl
a
g v
a
r
i
able
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-08-18
Elijah Ne
w
ren
merge-ort: remove
translator leg
o
in new "
s
ubmodule
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-07-23
Elij
a
h
New
r
en
merge: do not
exit r
e
store_state() prematu
r
ely
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-07-23
Elijah
New
r
en
merge: ensure we ca
n
ac
t
uall
y
resto
r
e
pre-merg
e
state
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-07-23
El
i
ja
h
Newren
m
e
rge
:
make
resto
r
e_st
a
t
e
() restore staged state
too
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-07-23
Elijah Newren
mer
g
e
:
fix save_state() to w
o
r
k
when there are stat
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-07-23
E
li
j
ah Newren
merge: do n
o
t abort
earl
y
if one str
a
tegy
f
ail
s
to
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-07-23
Elijah
Newr
e
n
merge
:
abort if index does n
o
t
match HEAD for
t
riv
i
al
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-07-23
El
i
j
a
h
N
ewren
merge-resolve: abor
t
if i
n
d
ex does not match HE
A
D
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-07-23
Elijah
N
e
wren
merge-ort-wrappers
:
make prin
t
ed message match th
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-07-06
Elijah Newre
n
merge-ort:
f
i
x iss
u
e
with du
a
l renam
e
a
n
d add/add conflict
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-07-06
Elijah Newren
m
e
rge-ort: shuff
l
e the com
p
utation and cleanup of potential
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-07-06
Elijah Newren
merge-ort: make a sep
a
r
a
te function for freeing
struct
.
.
.
Signed-off-by:
Elijah Newren
<newren@palantir.com>
commit
|
commitdiff
|
tree
2022-07-06
Elij
a
h Ne
w
ren
merge-ort: small clean
u
ps of check_fo
r
_director
y
_
r
en
a
me
Signed-off-by:
Elijah Newren
<newren@palantir.com>
commit
|
commitdiff
|
tree
2022-07-06
Elija
h
New
r
en
t6423: add
test
s
of
d
u
al
directo
r
y rena
m
e
pl
u
s
add
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-07-01
Elijah New
r
e
n
t6429: fix use
of
n
on
-
e
xiste
n
t function
Signed-off-by:
Elijah Newren
<newren@palantir.com>
commit
|
commitdiff
|
tree
2022-06-22
Elijah Newren
g
it-merge
-
tree
.
txt: add a se
c
t
ion on p
o
tention
a
l usage
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
E
l
ija
h
Newren
merge-tree: add a --allow-unrelated-
h
istories flag
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
Elijah Newren
m
er
g
e
-
tree: allow `ls-files -u` s
t
yle info
to be NUL
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
Elijah Newren
merge-or
t
: optionall
y
produce machine-read
a
ble output
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
Elijah New
r
en
merge-or
t
:
s
t
o
re mor
e
spec
i
fic conflict informatio
n
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
Elijah Newren
mer
g
e-tree: provide easy access to `ls-files -u` style
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
Elijah Ne
w
ren
merge-tree: provi
d
e a lis
t
of which files have co
n
flicts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
Elijah
N
e
wren
m
erge-ort: remove comman
d
-line-centric
su
b
module mess
a
ge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
Elijah Newren
merg
e
-o
r
t:
p
rovide a merge_get
_
co
n
flicted_files() helper
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
Eli
j
ah Newren
m
erge-t
r
ee:
su
p
port including merge mess
a
ges in output
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
Elijah Newren
merge
-
or
t
: split
out a sep
a
rate
display_update_messages
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
Elijah Newren
merge-tree:
i
mplement real merge
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
Elijah
Newren
m
erge
-
t
ree:
a
dd
o
ption parsing
and
i
n
itial
shell for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
Elijah
Ne
w
ren
merg
e
-tree: move lo
g
i
c for
existing merge i
n
to new
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
E
l
ijah Newren
merge-tree: re
n
ame merge_trees() t
o
trivial_merg
e
_trees()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-04-22
Elija
h
Newr
e
n
Docu
m
e
n
tation: some sparsity wording clarifications
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-04-22
Elija
h
N
ewren
g
it-sparse-checko
u
t
.
txt: m
a
rk non
-
cone mode as deprecat
e
d
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-04-22
El
i
jah Newr
e
n
git
-
sparse-checko
u
t
.
txt: flesh out pa
t
tern set
section
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-04-22
Elijah Newre
n
git
-
sparse-checkout
.
t
x
t: add a ne
w
EXAMPLES se
c
tion
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-04-22
Elijah Newren
git-s
p
arse-checkout
.
txt:
s
huffle some sections and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-04-22
Elijah
Newren
git-s
p
arse-chec
k
out
.
txt: u
p
date
d
ocs for
d
e
p
r
e
cati
o
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-04-22
El
i
j
a
h
N
e
w
ren
git-
s
pa
r
se-checkout
.
txt: wording
updates for the cone
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-04-22
Elijah Newren
s
p
ar
s
e-checkout: make
-
-cone the defaul
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-04-22
Elija
h
Ne
w
ren
tests: stop as
s
umin
g
--no-cone is the de
f
ault mode
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-03-02
E
lijah Ne
w
ren
repo_read_index: add config to e
x
pect files ou
t
side
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-03-02
E
lijah Newre
n
m
erge-ort: exclude
messages from inner
merg
e
s by
default
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-20
Elijah Ne
w
ren
merge-ort: fix small memory leak in uni
q
u
e
_
path()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-20
Elijah N
e
w
ren
merge-ort: fix sm
a
ll me
m
ory lea
k
in de
t
e
c
t
_and_proces
s
_renames()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-20
Elijah Newren
spa
r
s
e-checkou
t
: reject ar
g
u
m
e
nts in
c
o
ne-mod
e
t
hat
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-20
Elijah Newren
sparse-checkout: erro
r
or warn whe
n
given indivi
d
ual
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-20
Elijah Newren
sp
a
rs
e
-che
c
kout
:
pay attention
t
o pref
i
x for {
s
et,
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-20
Elijah Ne
w
ren
s
p
arse-checkou
t
: correctly set non-cone mode when
e
xpec
t
ed
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-20
E
lijah
Newren
s
p
arse-checkout: cor
r
ect reapply
'
s handling
o
f
o
ptions
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-17
E
lijah Newren
m
e
rge-ort: make informati
o
nal
messages from recursive
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
Elijah Newren
diff-merges
:
av
o
i
d
history simpli
f
ications
w
h
en diffing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
Eli
j
ah Newren
merge-or
t
: ma
r
k conflict/warnin
g
messages f
r
om inner
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
Elija
h
Ne
w
r
e
n
s
h
ow, log: include c
o
nflict/warning messag
e
s in --rem
e
rge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
Elijah
Newren
dif
f
: add
a
bili
t
y to insert
a
dditional headers for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
Elija
h
Newren
m
e
rge-ort
:
format me
s
sages slightly dif
f
e
r
ent for u
s
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
Elijah Newren
merge-ort: mark a few more conf
l
ic
t
mes
s
ages as omittable
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
Elijah Newr
e
n
me
r
ge-ort: capture and print ll-merge
w
arnings i
n
our
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
Elijah Newren
ll
-
me
r
ge: make
callers r
e
s
ponsible
f
or showi
n
g warnings
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
Elijah New
r
en
lo
g
: clean unneede
d
objects during `log --remerge-di
f
f`
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
Elij
a
h New
r
en
show,
l
og: pr
o
vide a --
r
emerge-d
i
ff ca
p
ability
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
Elijah
N
ewr
e
n
re
p
o
-
setting
s
: rename the traditiona
l
defau
l
t fetch
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
Elijah
N
ewren
rep
o
-s
e
tt
i
ngs: fix
e
rror h
a
n
d
ling for unknown values
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
E
l
ijah Newren
repo-setti
n
gs: fix check
i
ng for f
e
tch
.
negotiation
A
lgorith
m
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-01-28
El
i
j
a
h Ne
w
ren
sparse-checkout: fix a couple
minor memory leaks
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-01-26
El
i
jah Newren
sequenc
e
r
,
stash
:
fix
r
unni
n
g from worktree subdi
r
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-01-21
Elijah Newren
merge: fix memory leaks in cmd_mer
g
e()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-01-21
Elijah
N
e
w
ren
mer
g
e
-
ort: fix memory leak
i
n merg
e
_
o
rt_interna
l
()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-01-17
Elijah Newr
e
n
merge-ort: av
o
i
d
ass
u
ming al
l
r
ena
m
es detected
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next