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
sparse-checkout: use in-process update for disable subcommand
2019-11-02
Elijah Newren
RelN
o
t
e
s/2
.
2
4
.
0: fix self-contra
d
ictory
note
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-11-02
Elijah Newren
RelNote
s
/2
.
24
.
0: t
y
pofix
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-23
Elijah Newren
t
60
4
[236]:
d
o n
o
t
run setup in
sepa
r
a
te te
s
ts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-23
Elijah Ne
w
r
e
n
merge-rec
u
rsive:
fix merging a subdirectory
i
nto the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-23
Eli
j
ah N
e
wren
merge-
r
ecur
s
ive: clean
u
p get_renamed_dir_
p
ortion(
)
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-08
Elijah
N
ewren
merge-
r
ecursiv
e
: fix
t
he fix to
the diff3 co
m
mo
n
ances
t
or
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
Elijah Newren
fast-export: handle nested
tags
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
Elijah Newren
t9350: add tests for
t
ags
o
f t
h
ings
o
ther th
a
n a c
o
m
m
it
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
Elijah Newren
fast-export: a
l
low use
r
to req
u
est tags
b
e ma
r
ked with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
E
lijah
N
e
wren
fast-expo
r
t: a
d
d support
f
o
r
--import-
m
arks-if
-
exi
s
ts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
Eli
j
ah Newren
fast-i
m
port: add
support for new '
a
l
i
as'
c
om
m
and
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
Elijah New
r
e
n
fast
-
i
mpor
t
:
allow
tags t
o
be ident
i
fied by mark labels
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
Elijah Newr
e
n
fa
s
t-import: fix handling of deleted tags
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-02
Elijah Newren
merge-rec
u
rsive: fix the diff3 common a
n
cestor label
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-02
Elijah Newren
di
r
: specia
l
case check fo
r
t
h
e possi
b
ility that path
s
pec
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-28
E
lijah Newren
fast
-
export
:
fix export
i
ng a tag and
nothing e
l
se
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
E
l
ijah Newren
c
lean: fix
theoretical path
c
orru
p
tion
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah Newren
clean:
rewrap overly lon
g
line
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
El
i
ja
h
N
ewre
n
cle
a
n: avoid
re
m
oving untrack
e
d files in a
nest
e
d git
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elija
h
Newre
n
clea
n
: d
i
sambiguate the definit
i
on of -d
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
E
lij
a
h Newren
gi
t
-
c
lean
.
txt: do
not
c
laim we wi
l
l
dele
t
e files
w
ith
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah Newren
d
i
r: add co
m
m
en
t
ary expl
a
ining match_pathspec_item
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah Newren
dir: if our path
s
pec might mat
c
h
files under
a dir
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah
N
e
w
r
en
dir: make the DO_MATCH_SUBMODULE code r
e
usable f
o
r
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah Newren
dir: also ch
e
ck dir
e
ctories f
o
r
m
a
tching p
a
thspecs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elija
h
Newren
dir: fix off-by-one err
o
r in mat
c
h
_pa
t
hspec_item
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Eli
j
ah Newren
d
i
r: fix typ
o
in c
o
mment
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah N
e
w
r
e
n
t73
0
0
: add tes
t
cases showing
fail
u
r
e to clean specified
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-05
Elija
h
Newren
t9902
:
u
s
e a non-de
p
recated
c
ommand for testing
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-05
Eli
j
ah
N
ewre
n
R
eco
m
mend git-filter-
r
epo instead of git-f
i
lter-branch
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-05
Elijah New
r
e
n
t6
0
0
6
: simplify, fix, a
n
d
o
ptimize empty
message test
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-05
Eli
j
a
h Newren
t
3427: accelerate this
t
e
st by using fast-export and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-01
Eli
j
ah
Newren
merge-options
.
tx
t
: clari
f
y mea
n
ing of various
f
f-rel
a
ted
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah
N
ewren
me
r
g
e
-r
e
cu
r
s
i
ve: alphabetize incl
u
de list
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
E
lijah
N
ewren
merge
-
recur
s
ive: a
d
d sanity ch
e
cks for relevant merge_options
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
me
r
g
e
-recursive:
r
ena
m
e
MERGE_RE
C
U
RSIVE
_
* to MERGE_VARIANT_*
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
E
lijah Newren
merge-
r
ecursive: split i
n
ternal fields
i
nto a separate
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newr
e
n
mer
g
e-recursive: avoid losing output and leaking memory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
me
r
ge-recur
s
i
v
e
:
com
m
ent and reord
e
r the
mer
g
e_options
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
E
l
i
jah New
r
en
m
e
rge-recursive
:
consolidate unneces
s
ary
fi
e
lds in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
E
lij
a
h
N
ewren
merge-recursive
:
m
ove som
e
def
i
nitions aro
u
nd
t
o clean
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
E
lijah Newr
e
n
merge-recu
r
sive: ren
a
m
e
m
e
rge_op
t
ions
argument to opt
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
El
i
j
a
h Newren
merge-recursive:
r
e
name
'mrt
r
ee'
to
'
result_t
r
ee',
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elija
h
Newre
n
m
erge-recursiv
e
: use common n
a
me
fo
r
anc
e
stors/common
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
merge-recu
r
sive:
fi
x
some overly long li
n
es
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
E
l
ijah Newren
cach
e
-tree: s
h
a
re code betwee
n
functi
o
ns writing an
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newre
n
mer
g
e-recursive: don't force external c
a
llers to do
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
m
er
g
e-recursive: rem
o
ve useless parameter
i
n
m
erge_tr
e
es()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
merge-recursive:
exit early if
i
ndex != head
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
El
i
jah Newren
Ensur
e
i
n
dex
matches
he
a
d b
e
fore invoking
merge machinery
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elija
h
Newren
merg
e
-r
e
cu
r
sive: r
e
mo
v
e an
o
ther
imp
l
i
cit dependency
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Ne
w
ren
merge-recu
r
sive: future-proof update_file_
f
l
a
g
s
(
) against
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
E
l
ijah Newren
merge-recu
r
sive: prov
i
de a better label for diff3 com
m
o
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-16
Elijah N
e
wren
m
e
rge-recur
s
iv
e
:
en
f
orce opt->a
n
cestor != N
U
LL when
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-16
Elijah Newre
n
ch
e
ckout: provide better conflict hun
k
description
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-16
E
l
ij
a
h Newren
merge-recur
s
ive: be consistent with assert
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-16
E
l
ijah Newren
checkout: remo
v
e duplica
t
e code
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-12
E
lijah Newren
git-fast-impor
t
.
txt: cl
a
rify th
a
t multi
p
le
m
e
rge
c
ommits
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-06
Elija
h
Ne
w
ren
merge
-
recursive
:
a
v
oid directory re
n
ame detec
t
i
o
n in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-06-05
E
l
ij
a
h New
r
en
me
r
ge-recursive: restore acciden
t
al
l
y dropped settin
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-05-14
Elijah Newren
fast-exp
o
rt: do
a
utomat
i
c
reencoding of c
o
mmit
messages
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-05-14
Elijah
N
ewren
fast
-
exp
o
rt: differentiate
b
et
w
een e
x
plicitly U
T
F
-
8
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-05-14
Elijah
Newren
fast-e
x
p
o
rt: av
o
id s
t
ripping enc
o
di
n
g he
a
d
er if w
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-05-14
Elijah Newren
f
a
st-imp
o
rt: support '
e
ncoding
'
commit header
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-05-14
Elij
a
h
N
ew
r
en
t
9350
:
fix e
n
coding
t
e
s
t to
actua
l
ly test reen
c
oding
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-26
El
i
jah Newren
H
o
nor c
o
re
.
p
rec
o
mposeUnico
d
e in more places
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah Ne
w
ren
m
erge-recursive: switc
h
d
ire
c
tory rename
detection
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Eli
j
ah
N
e
w
ren
merge-recursi
v
e: give
cal
l
er
s
o
f handle_content_m
e
rge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah Newren
mer
g
e-recursive:
t
r
ack
i
nformat
i
on
a
s
sociat
e
d
w
i
th
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Eli
j
a
h
N
ewren
t
6
043:
f
ix copied test description to match its p
u
rpo
s
e
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
E
l
ijah Newren
me
r
g
e-re
c
ursive: switch
f
r
o
m
(
oid
,
mode) pairs to a
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
E
lijah Newren
merge-recursive:
cleanup hand
l
e_ren
a
me_* function
signat
u
re
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
E
l
ijah
Newren
mer
g
e
-
rec
u
rsive: track branch where re
n
ame occurred
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elija
h
Newren
merge-recur
s
iv
e
: remove ren[
1
2]_other fiel
d
s
from rename_con
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Eli
j
a
h Newren
merge-recursive
:
shrink rename_conflict_info
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elij
a
h Newr
e
n
m
e
r
g
e-r
e
c
u
r
sive
:
m
ove som
e
struct decl
a
r
a
tions
t
ogeth
e
r
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
E
lijah
New
r
en
me
r
ge-r
e
c
u
rsive: use 'ci' for rename_confl
i
c
t_info
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah New
r
en
merge-recursive:
r
ename
locals
'
o' an
d
'a' to 'obu
f
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah Newren
merge-recursiv
e
: rename diff_fi
l
espec
'one' t
o
'o'
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
E
lija
h
N
e
w
ren
me
r
ge-r
e
cursive:
r
ename m
e
rge_options
a
rgument f
r
om
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
El
i
jah
Newren
Use
'
unsigne
d
short' for mode
,
like dif
f
_
f
il
e
spec does
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-01
Elijah Newre
n
fast-i
m
po
r
t:
f
ix er
r
oneous handlin
g
of get-mark with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-01
Elijah N
e
wren
fast-import: only all
o
w cat-blob requests where
i
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-01
Eli
j
ah Newren
f
ast-import
:
ch
e
ck most p
r
omi
n
ent comman
d
s first
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-01
Elija
h
Newre
n
git
-
fast-i
m
port
.
txt: fix
w
ording ab
o
u
t where l
s
comma
n
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-01
E
lijah Ne
w
r
en
t
9
30
0
: demonstrate bug
wit
h
get-mark and em
p
ty orph
a
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-02-21
Elijah
N
e
wren
merge-options
.
txt: correct
wo
r
ding of --no-com
m
it option
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-02-14
Elij
a
h
N
ewren
git-rebase
.
t
x
t: upda
t
e
to
reflect m
e
rge no
w
imp
l
emented
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-02-08
Elijah
N
ewren
log,
d
iff-tre
e
: add --combined-all-pa
t
hs o
p
tion
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-01-10
Elijah Newren
git-show-ref
.
txt:
fix order of flags
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-01-07
Elij
a
h
Newren
rebase: impl
e
ment --merge v
i
a the inte
r
activ
e
machi
n
e
r
y
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Elijah Newren
rebase: d
e
fine linearization o
r
d
e
ring and enforce i
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Elijah Newre
n
git-
l
eg
a
cy-rebase: simplify u
n
necessary
t
riply-
n
ested if
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Elijah Newren
g
it-rebase, sequenc
e
r
:
ex
t
end --quiet option for the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Eli
j
ah
Newren
am, rebas
e
--merge: do not overlook --ski
p
'
ed commits
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Elijah
N
ewren
t5
4
07
:
a
d
d
a
test demonstrating
h
ow
i
nter
a
ctive h
a
n
dles
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Elijah Newren
rebase: fix incompati
b
le o
p
tions error mess
a
ge
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Elij
a
h
Newren
rebase:
make builtin and legacy
scr
i
pt e
r
ror mes
s
ages
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-09
E
l
i
j
a
h Newren
gi
t
-
rebase
.
t
xt: upd
a
te
n
ot
e
about directory re
n
ame
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
E
l
ijah
N
ewre
n
fast-export: add a --show
-
original-ids opti
o
n
t
o show
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next