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: create 'disable' subcommand
2019-11-02
Elijah
N
ewren
RelNotes/2
.
24
.
0: fix self-c
o
ntradictory note
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-11-02
Elijah N
e
wren
RelNo
t
es/2
.
24
.
0
:
t
y
p
o
fix
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-23
Elijah
Newren
t604[236]: d
o
not run setup in
separate tests
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-23
Elijah Newren
mer
g
e-
r
ecursive: fix
m
e
rging a subdire
c
tory in
t
o
t
he
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-23
Elijah New
r
en
merge-recursi
v
e: c
l
ean
up get_renamed
_
dir_portion()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-08
Elijah Newren
merge-recursive
:
fix
the fix to the
d
iff3 common an
c
estor
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
Elij
a
h N
e
wren
fa
s
t-export: handle nested tags
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
El
i
jah Newren
t9350: add tests
f
o
r
t
ags of t
h
ings
other than
a
c
ommit
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
E
l
ijah
N
ewren
fast
-
e
x
port: allow user
t
o req
u
e
s
t t
a
gs be mark
e
d with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
Elijah Newren
fast-export: add s
u
p
p
ort for --import-marks-if-exists
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
Elijah
N
ewren
fast-
i
mport: add su
p
port
for new 'alias' command
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
Elij
a
h Newren
fast-import: allow tags to be
identified by mark
labe
l
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
Elijah New
r
en
fast-im
p
or
t
:
fix
han
d
ling o
f
deleted tags
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-02
Elijah Newren
mer
g
e
-recursive: fi
x
t
he diff3 c
o
mmon ancest
o
r label
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-02
E
l
i
jah
Newren
dir
:
spe
c
ial ca
s
e
c
h
eck for the p
o
ssi
b
ility that paths
p
e
c
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-28
Elijah Newren
fast-export: fix exporting a tag and nothin
g
else
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah Ne
w
ren
clean:
fi
x
t
heoretical path cor
r
uption
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah
N
e
wren
clean: rewrap overly
l
o
ng line
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah Newren
clean: avoid removing untracked files in a nested git
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah
Newren
clea
n
: disamb
i
guat
e
th
e
definition of -
d
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah Newren
git-clean
.
txt: do not claim
w
e will
delet
e
f
i
l
e
s
with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
El
i
jah Newren
dir: add commentary explaining match_pathspec
_
item
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah
Newren
dir: if o
u
r pathspe
c
mi
g
ht match f
i
les
u
nder a di
r
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Eli
j
ah Newren
dir:
m
ake the DO_MATCH
_
SUBMODULE c
o
de
r
eusable for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah
N
ewr
e
n
dir: also chec
k
directorie
s
fo
r
ma
t
ching
pathspecs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah
N
ewren
dir: f
i
x off-by-one
erro
r
in match_p
a
thspec_item
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
El
i
jah Newren
di
r
: fix typo
i
n
commen
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah New
r
en
t7300: add testca
s
es showing fai
l
ure to clean
s
pecified
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-05
Elijah
Ne
w
r
e
n
t9
9
02: use
a
non-
d
eprecated
c
omm
a
nd f
o
r
testing
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-05
E
lijah
N
ewren
Recommend git
-
filter-repo instead o
f
git-filt
e
r-branch
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-05
Elijah
Newren
t6006: sim
p
lif
y
, fix, and
optim
i
ze empty
m
essage test
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-05
Elijah Newren
t3427
:
a
ccelerate thi
s
test by using
f
ast-ex
p
ort an
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-01
Elijah Ne
w
ren
mer
g
e-op
t
ions
.
t
x
t:
clari
f
y
m
e
ani
n
g of various ff-re
l
ated
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
E
lijah Newren
merge-re
c
ursive:
a
l
phab
e
t
ize includ
e
list
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
merge-recursive: add s
a
nity
c
hecks for
r
elevan
t
merg
e
_options
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
El
i
j
ah
N
ewren
merge-recur
s
iv
e
: re
n
am
e
MERGE_RECURSIVE
_
* to MERG
E
_VARIANT_*
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah N
e
wre
n
merge-r
e
cursive: split in
t
ernal fields
in
t
o a se
p
arate
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newr
e
n
merge-recurs
i
ve: avoid lo
s
ing output and
leaking memory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah
N
ew
r
en
merge-re
c
ursive: comment and reorder the mer
g
e_options
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
m
e
r
ge-recursive: c
o
nsolidate
u
nne
c
e
ssary fields
in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah
Newren
merge-recursive: move so
m
e de
f
initi
o
ns arou
n
d
t
o clean
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Eli
j
ah Newren
merge-recur
s
ive: rename
merge
_
options
a
rgument to opt
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
m
erg
e
-recursive: rename 'mrtree' to
'
result_tree',
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah
Newren
merge-recur
s
iv
e
: use common name
f
or anc
e
s
t
ors/co
m
mon
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
merge-recursi
v
e: fix some o
v
erly long lines
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elij
a
h Newren
cache-t
r
e
e
: s
h
ar
e
c
ode betw
e
en functions writin
g
an
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elija
h
Ne
w
ren
merge-r
e
c
ursive: don't for
c
e
e
x
ternal
callers
t
o
d
o
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elij
a
h Newren
m
erge-recu
r
sive: r
e
move usel
e
ss parameter i
n
m
e
r
g
e_t
r
ees()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
E
lijah Newren
m
e
rge-r
e
c
urs
i
ve: exi
t
early if
i
ndex != head
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
El
i
jah N
e
wren
Ensure index m
a
tches
h
ead b
e
fore i
n
voking merge machi
n
ery
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
m
e
rge-
r
ecu
r
sive:
r
e
move
another implicit
dep
e
nde
n
cy
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah N
e
wren
merge-recu
r
sive: f
u
t
u
r
e-p
r
oof update_fil
e
_flags()
a
gai
n
st
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
merge-recur
s
ive: provide a bette
r
labe
l
f
o
r diff3 common
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-16
E
lijah Newren
merge-recursive: enf
o
rc
e
opt->ancestor
!=
NULL when
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-16
Eli
j
ah Newren
chec
k
ou
t
: pro
v
ide better
conflict hunk
d
escrip
t
i
o
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-16
Elija
h
Newren
merge-recursi
v
e
:
be consistent with assert
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-16
E
lijah Newren
c
heckout: r
e
move
d
upli
c
ate code
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-12
Elijah Ne
w
re
n
gi
t
-fast-import
.
txt: clarify tha
t
multiple merge commits
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-06
Elijah Newren
mer
g
e
-recursive
:
avoi
d
direc
t
ory rename detecti
o
n
in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-06-05
Elijah Newren
merge-r
e
cursi
v
e: rest
o
re
a
cc
i
dentally dropped
setting
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-05-14
Elij
a
h Newre
n
fast-export: do automatic
reencoding
o
f
c
ommit
m
essag
e
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-05-14
E
l
ijah Newren
fas
t
-e
x
port: differen
t
ia
t
e be
t
ween explicitly
U
TF-8
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-05-14
Elijah Newren
f
ast-e
x
port:
avoid stripping encodi
n
g heade
r
i
f
we
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-05-14
Elijah Newre
n
fast-im
p
ort:
s
upport 'e
n
coding' commit heade
r
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-05-14
E
l
ijah Ne
w
ren
t9350: fix encoding test to actually t
e
st reen
c
odi
n
g
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-26
Elijah Newren
Hon
o
r cor
e
.
precomposeUnicode in more
p
l
aces
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah Ne
w
ren
mer
g
e-rec
u
rs
i
ve: switch dir
e
ctor
y
renam
e
detection
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah
N
ewren
merge-recursive: give callers o
f
hand
l
e
_co
n
tent_merge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elij
a
h Newre
n
me
r
ge
-
re
c
ursi
v
e:
t
rack information associated
w
ith
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah N
e
wren
t6
0
43: fix copied test
d
escri
p
ti
o
n to ma
t
ch i
t
s
purp
o
se
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah New
r
en
m
erge-recursi
v
e: switch from (
o
id,mode) pairs t
o
a
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
E
l
ijah Newren
merge-re
c
ursive:
c
leanup handl
e
_rename_*
function
sig
n
atures
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Eli
j
ah Newren
merge-recursive:
track branch
w
h
e
r
e rename o
c
curred
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
E
lijah
N
ewren
m
e
rge-
r
ecursive: rem
o
ve ren
[
12
]
_other fi
e
l
ds from
ren
a
me_con
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Eli
j
ah Newren
m
erge-recursive: shrink rename_conflict_in
f
o
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Eli
j
ah Newren
me
r
ge-re
c
urs
i
ve: move some struct declarat
i
ons t
o
g
ether
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
El
i
jah
N
e
wren
merge-recursiv
e
: use
'ci'
f
or
rename_conflict_i
n
f
o
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah Newren
merge-recursive: re
n
ame locals 'o' a
n
d
'a' to 'obuf
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah
N
ewren
merge-re
c
ursive: r
e
nam
e
d
i
ff_filespec 'o
n
e' to 'o'
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Eli
j
a
h
N
ewren
merge-recursi
v
e: rename
merge
_
o
p
tions argum
e
nt from
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah Newren
Us
e
'unsigned s
h
ort' for mode, lik
e
diff_filespec
does
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-01
Elijah Newren
fast-impo
r
t
: fix
erroneo
u
s
handling of get-mark with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-01
Elijah Newren
fas
t
-import: onl
y
allo
w
cat-blob re
q
uest
s
wh
e
re i
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-01
Elijah Newren
fast-import
:
c
heck most prominent comman
d
s
first
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-01
Elijah Newre
n
gi
t
-fast-
i
mp
o
r
t
.
txt: fix word
i
ng about where ls
c
ommand
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-01
Elija
h
Newren
t9300: demons
t
r
a
te
b
u
g with get-mark
and emp
t
y
o
rphan
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-02-21
Elijah Newren
me
r
ge-options
.
txt
:
co
r
rect w
o
rding of --no-commit op
t
io
n
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-02-14
Elija
h
Newren
gi
t
-
rebase
.
txt: upda
t
e to re
f
l
ect merge no
w
implemente
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-02-08
Elijah New
r
en
log
,
di
f
f-tree: add
-
-combined-al
l
-pat
h
s o
p
tion
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-01-10
Elij
a
h
N
ewren
git
-
show-ref
.
txt: fix o
r
der of fl
a
gs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-01-07
E
lijah
N
ewr
e
n
re
b
ase: implement
--mer
g
e
via
t
he interactive machinery
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Elijah Ne
w
ren
re
b
ase: define linearization o
r
dering and enforce it
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Elija
h
Newren
git-lega
c
y
-r
e
base: simpl
i
fy unn
e
cessary
t
rip
l
y-nested if
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Elijah Ne
w
ren
git-re
b
ase, sequencer:
e
x
tend -
-
qu
i
e
t
option f
o
r
the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
E
lijah N
e
wren
a
m,
r
e
b
as
e
--mer
g
e
: do not ov
e
rlook --ski
p
'ed commits
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Elijah Newren
t5407: a
d
d a test de
m
onstrat
i
ng ho
w
inter
a
ctive handles
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Elijah Newren
rebase: fix
i
n
compatible op
t
ions error message
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Elijah
N
e
w
ren
r
e
base: make builtin and legac
y
script
e
rror messages
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-09
Elijah
N
e
w
ren
git-rebase
.
txt
:
up
d
ate note about
d
irectory rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah Newren
f
a
st-export: add a --s
h
o
w
-original
-
ids opti
o
n
t
o
sho
w
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next