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
unpack-trees: add usage notices around df_conflict_entry
2023-02-27
Eli
j
a
h Newren
un
p
ack-trees: a
d
d u
s
age notices around df_conflict_entry
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-02-27
Elijah New
r
en
unpack-trees: specia
l
case
read-tree debugging as internal
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-02-27
E
lija
h
N
e
wren
unpack-tre
e
s: re
w
rap a few o
v
erl
o
ng lines from previous
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-02-27
Elij
a
h N
e
wren
u
np
a
c
k-tree
s
: mark fields onl
y
use
d
int
e
r
n
a
l
l
y
as internal
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-02-27
Elijah Newren
u
n
pack_
t
rees: start s
p
litt
i
ng internal fields from
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-02-27
Elijah N
e
w
ren
sparse-checkout:
a
v
oid using inte
r
nal
A
PI of un
p
ack
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-02-27
Elijah
N
ewren
sparse-chec
k
o
u
t:
a
void using inte
r
nal A
P
I
of unpack
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-02-27
Elija
h
Newren
unpack
-
tr
e
es: clean up some flow control
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-02-27
El
i
jah Newre
n
d
i
r
:
mar
k
output
only field
s
of dir_
s
truct as such
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-02-27
E
l
ijah
New
r
e
n
d
ir: add a usag
e
n
ote to exc
l
ude_p
e
r
_
dir
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-02-27
Elija
h
Newren
dir: separa
t
e pu
b
l
i
c from intern
a
l
p
ortion of dir_
s
truct
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-02-27
Elijah New
r
en
unpack-trees: heed reque
s
ts to ov
e
rwri
t
e ign
o
red
file
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-02-27
E
l
ija
h
New
r
e
n
t2021: fi
x
p
latform-
s
pe
c
i
f
i
c
l
eftover
cruft
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-02-09
Elij
a
h
Newren
name-rev: fix names by dropping taggerdate workaround
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-01-25
Elijah Newren
r
e
base: provide bet
t
er e
r
r
o
r m
e
ssage for ap
p
ly opti
o
ns
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-01-25
E
lijah Newr
e
n
rebase:
p
ut rebase_options initialization in single
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-01-25
Elijah Newre
n
rebase:
f
ix for
m
atti
n
g of
reba
s
e
--
r
eap
p
ly-cherry-picks
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-01-25
E
lijah Newren
rebase:
c
lari
f
y
t
h
e OPT_
C
MDMODE
i
ncompatibilities
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-01-25
Elijah Newren
re
b
a
s
e:
ad
d
cov
e
r
age of
o
ther incompatible options
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-01-25
Elijah
N
ewren
rebase: fix incompatiblity check
s
for --
[
no-]reapply
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-01-25
E
l
ijah Newren
rebase
:
f
ix docs abo
u
t in
c
ompatibi
l
ities with -
-
r
o
ot
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-01-25
Eli
j
ah
N
ewren
r
ebase:
remove -
-
al
l
ow-em
p
ty-m
e
ssa
g
e from incompat
i
ble
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-01-25
Elija
h
N
e
wren
rebas
e
: flag
--apply and
--merge
as i
n
com
p
atible
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-01-25
Elijah Newren
r
e
base
:
mark --
u
pdate-refs as r
e
q
uir
i
n
g th
e
m
erge ba
c
kend
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-01-15
Elijah New
r
en
t6
4
26: f
i
x TODO
a
bout making
test more comprehensiv
e
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-01-13
Elijah Newren
ls-files: guide folks to --exclude
-
sta
n
dard over ot
h
er
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-01-13
Elijah
N
ewren
ls-files:
c
l
a
rify descriptions of
s
tatus tags f
o
r -t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-01-13
El
i
jah
N
ewren
ls-files
:
clarif
y
description
s
of
f
ile
selection op
t
ions
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2023-01-13
Elijah
Newren
ls-f
i
les: ad
d
missing documentation f
o
r
--resolve-un
d
o
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-11-07
Elij
a
h Newren
sparse-checkout
.
txt: new document w
i
th spa
r
se-checkout
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-10-23
E
l
i
jah Newren
merge-tree: su
p
port mul
t
i
ple batched
merges with -
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-10-23
Elija
h
Ne
w
ren
merge-tre
e
: up
d
ate
d
ocumentation fo
r
differences in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-10-22
Elija
h
Newre
n
merg
e
-ort: fi
x
bug w
i
th dir rename
vs change di
r
to
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-09-02
Elijah Newren
d
iff: fix filte
r
ing of m
e
rge commits un
d
er --remer
g
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-09-02
El
i
j
a
h Newren
d
i
ff
:
f
ix filtering of addition
a
l headers
under --reme
r
g
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-09-02
Elijah Newren
diff: have submodule_for
m
at logic
avoid
add
i
t
i
on
a
l
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-08-26
Elijah Newren
t64
x
x: convert 'test_creat
e
_re
p
o' to
'
git init'
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-08-24
Elija
h
N
e
wren
t4301:
a
dd more intere
s
ting merge-tree testcases
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-08-24
Elijah Newren
merg
e
: small
c
o
d
e read
a
bilit
y
i
m
provement
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-08-24
Elijah
N
e
wren
merge: cleanu
p
confusi
n
g logic
for hand
l
ing successful
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-08-24
Elijah Newren
merge: only
apply au
t
ost
a
sh when ap
p
ropriate
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-08-19
Elijah
N
ewren
revision: allow -
-
a
n
c
estr
y
-path to take an argu
m
e
n
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-08-19
E
lijah New
r
e
n
rev-list-options
.
txt: fi
x
simple
t
yp
o
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-08-19
E
l
i
j
ah Ne
w
r
en
merge-ort: r
e
m
o
ve code obsol
e
ted by
o
ther
changes
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-08-18
El
i
jah Newren
m
e
rge-or
t
:
p
r
ovide helpful submodule update message
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-08-18
Elijah
N
e
wren
merge-ort
:
avoid sur
p
r
i
se
with ne
w
sub_flag variabl
e
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-08-18
E
l
i
jah
Newren
m
erge-ort: re
m
ove tra
n
slator lego in ne
w
"submodule
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-07-23
E
l
i
jah
Newren
merge: do not
ex
i
t restore
_
state() prema
t
u
rely
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-07-23
Elijah Newren
merge: ens
u
re we can actua
l
ly
restore p
r
e-me
r
ge state
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-07-23
Elijah N
e
wren
merg
e
: make
restore_s
t
ate() re
s
tor
e
staged stat
e
too
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-07-23
Elijah Newren
merge: fix save_state() to work when there are st
a
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-07-23
E
lijah Ne
w
r
en
merge
:
d
o
n
ot
a
bort e
a
rly if o
n
e st
r
a
tegy fa
i
ls
to
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-07-23
Elijah Newren
merge:
abor
t
i
f
i
nd
e
x
d
oes not mat
c
h
HEAD for tri
v
i
a
l
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-07-23
Elijah Newren
mer
g
e-resolve: abort if index doe
s
no
t
match
H
EAD
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-07-23
Elij
a
h Newren
merge-ort-wr
a
p
p
ers: mak
e
printed
message
m
atch the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-07-06
Elijah
Newre
n
m
e
r
ge-ort: fix issue with
dual
renam
e
and a
d
d
/add c
o
nflict
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-07-06
Elijah Newren
merg
e
-ort: shuffle the computati
o
n and
c
leanup of
potenti
a
l
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-07-06
E
lijah
N
ewre
n
merge-ort: make a separate function
for f
r
eeing s
t
ruct
.
.
.
Signed-off-by:
Elijah Newren
<newren@palantir.com>
commit
|
commitdiff
|
tree
2022-07-06
Elijah
N
ew
r
e
n
m
e
rge-ort
:
small cleanups
of check_for_dir
e
c
t
or
y
_rename
Signed-off-by:
Elijah Newren
<newren@palantir.com>
commit
|
commitdiff
|
tree
2022-07-06
Elijah New
r
en
t6423: add test
s
of dual directory
r
ename plus add
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-07-01
Elijah N
e
w
r
e
n
t6429: fi
x
use of n
o
n-
e
xi
s
tent function
Signed-off-by:
Elijah Newren
<newren@palantir.com>
commit
|
commitdiff
|
tree
2022-06-22
Elijah Newren
git-merge-tree
.
txt: add a secti
o
n on p
o
tentional u
s
age
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
Elijah Newre
n
merge-
t
ree: add a --all
o
w-unrelated-hist
o
ries flag
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
Elijah N
e
wren
merg
e
-t
r
ee: allow `ls-files -u
`
s
tyle info to be
NUL
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
Elijah Newren
merge-ort:
optionally produ
c
e machine-re
a
dable ou
t
put
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
Elijah Newre
n
m
e
rge-ort
:
store more
specific conflict information
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
Elijah Newren
m
e
rge-tre
e
: provide easy access to `ls-files
-u`
s
t
yle
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
Elijah Newren
merge-tree: pro
v
ide a list of
w
h
i
c
h fil
e
s have conf
l
icts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
Elijah Newre
n
me
r
ge-
o
rt:
r
emove co
m
mand-
l
i
n
e-cent
r
ic sub
m
o
d
ule message
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
Eli
j
ah Newre
n
merge-
o
rt
:
provide a merge_get_conflic
t
e
d_fil
e
s() helper
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
Elijah Newren
merge-t
r
e
e
: supp
o
rt incl
u
di
n
g me
r
g
e
messages in
outp
u
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
Elijah Newre
n
m
erge-
o
rt:
split out
a
separa
t
e display_update_message
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
Elijah Newren
merge-tree: implement
r
eal merges
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
Elijah Newren
me
r
ge-tree: add
o
p
t
i
on p
a
rsing
an
d
initi
a
l shell for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
E
l
ijah Newre
n
merge-
t
ree: move logic f
o
r existi
n
g mer
g
e
i
nto new
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-06-22
Elijah Ne
w
ren
m
e
rge-tree: rename
merge_
t
rees() to t
r
ivial_merg
e
_trees()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-04-22
Elijah Ne
w
r
e
n
Documenta
t
ion:
s
o
m
e spa
r
s
ity
w
o
rding clarifications
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-04-22
Elijah Newren
git-sparse-check
o
ut
.
txt: mark n
o
n-c
o
ne mo
d
e as deprecated
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-04-22
Elijah Newren
gi
t
-sparse-check
o
ut
.
txt: flesh out pattern s
e
t sections
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-04-22
E
li
j
a
h
New
r
en
git-sparse-checkout
.
txt: add a ne
w
EXAMPLES section
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-04-22
Elija
h
Newren
git-sparse-checkout
.
t
x
t: shuffle some
secti
o
ns a
n
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-04-22
Elija
h
Newren
git-sparse-checkout
.
txt
:
up
d
ate
docs for deprecation
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-04-22
E
l
ijah Newren
git-sparse-checkout
.
txt: wording
u
pdates for the cone
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-04-22
El
i
jah Newren
sparse-ch
e
ckout:
m
ake --
c
one the def
a
u
l
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-04-22
Eli
j
ah
N
ewren
tests: stop ass
u
ming --no-
c
o
ne is the
default
mode
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-03-02
Elijah Newren
rep
o
_read
_
index: add confi
g
to
exp
e
ct fi
l
es outside
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-03-02
Elijah Newr
e
n
merge-ort: exclud
e
me
s
sages
f
r
o
m inner m
e
r
ge
s
by de
f
ault
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-20
E
lijah Newre
n
mer
g
e-ort: fix s
m
al
l
m
emory l
e
ak
in u
n
i
q
ue_path()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-20
Elijah N
e
wren
merg
e
-
o
rt
:
fix
s
mall
memory leak in d
e
te
c
t_and_p
r
o
c
ess_renames()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-20
Elijah Newren
sparse-checkout: reject arguments in cone-m
o
de that
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-20
Elija
h
Newren
s
p
a
r
s
e
-check
o
ut: err
o
r or warn when
g
iven individual
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-20
Elijah Newre
n
s
pars
e
-checkout: pay
a
t
t
e
ntion to prefix for
{
se
t
,
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-20
Elijah Newren
s
p
a
rse-
c
heckout:
c
orrec
t
ly s
e
t non-cone mo
d
e when
e
xpec
t
ed
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-20
Elijah Newr
e
n
sparse
-
checkout:
c
orr
e
c
t
reapply
'
s
h
a
ndling of option
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-17
Elija
h
Newren
merge-ort: m
a
ke informational messages from
recu
r
sive
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
Elija
h
Newr
e
n
diff-merg
e
s: avoid his
t
ory
s
impli
f
icatio
n
s
when diffing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
Elija
h
Newren
merge-ort: mar
k
conf
l
ict/warning
mess
a
ges from
i
nner
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
Elij
a
h
Newren
show,
log: include conflict
/
warning mes
s
ages in --
r
emer
g
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
E
l
ijah
N
ewren
diff: add
a
bility
t
o insert additional headers f
o
r
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2022-02-02
Elijah
Newren
merge-ort: format mess
a
ges slightly diff
e
rent
f
or
u
se
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next