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
msvc: accommodate for vcpkg's upgrade to OpenSSL v1.1.x
2019-11-02
Elija
h
Newren
RelNotes
/
2
.
24
.
0: fix self-contr
a
dictory
note
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-11-02
Elijah
Newren
R
el
N
otes/2
.
24
.
0: typofix
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-08
Elijah Newren
merge-recur
s
i
v
e
: fix
t
he f
i
x to
the d
i
f
f3 c
o
mmon a
n
cestor
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
Elijah
N
ewren
fast
-
e
x
p
o
rt
:
handle nested tags
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
Elijah New
r
en
t9
3
50: add
t
ests for ta
g
s of things other
t
h
an a com
m
it
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
Elijah Newren
fast-export: allo
w
user
t
o
req
u
est ta
g
s be mar
k
ed with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
E
l
ijah Newren
fa
s
t
-exp
o
rt: add su
p
port for --imp
o
r
t
-
marks-if-ex
i
sts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
Elijah N
e
wren
fast-import: add support fo
r
n
ew 'alias' comma
n
d
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
El
i
jah Newren
f
ast
-
im
p
o
rt: all
o
w tags t
o
b
e
identified by mark labels
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
Elija
h
Newren
fast-import: fix handl
i
ng
of dele
t
ed ta
g
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-02
Elijah New
r
e
n
mer
g
e-recursi
v
e: f
i
x
t
he dif
f
3
c
ommon ance
s
tor label
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-02
Eli
j
ah N
e
wren
di
r
:
special case check for
the possibility that pathspec
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-28
Elijah Newren
fa
s
t-ex
p
o
r
t: fix
exporti
n
g a tag and nothing else
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah Newren
c
lean: fi
x
the
o
re
t
ical pa
t
h corr
u
pti
o
n
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
E
l
ijah Ne
w
r
e
n
clean:
r
e
wrap overly long line
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elij
a
h Newren
clean: avoid r
e
m
ov
i
n
g
u
ntracked files in
a
nes
t
ed git
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
E
lij
a
h Newren
clea
n
: disambiguate the defin
i
tion of
-
d
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah Ne
w
ren
g
i
t-clean
.
txt: do
n
ot
c
laim
we will d
e
l
ete files with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah Newren
di
r
:
a
dd
c
o
m
m
ent
a
ry
e
x
p
la
i
nin
g
matc
h
_pathspe
c
_item
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah
N
ewren
d
ir: if ou
r
pathspe
c
mig
h
t ma
t
ch files under a dir
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elij
a
h Newren
d
ir: make
the DO
_
MATCH_S
U
BMODULE code reusable
f
or
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah Newren
dir: also check directorie
s
for match
i
ng pa
t
h
specs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elija
h
Newren
dir:
f
ix o
f
f-by-one erro
r
in
m
a
t
ch_pa
t
hspec_item
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah Newren
di
r
: fi
x
typo in comment
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah
Newren
t7300: add testcase
s
showing fa
i
lu
r
e to
clean speci
f
ied
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-05
El
i
jah Newren
t9902: use a non-depre
c
ated command for
testi
n
g
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-05
Elij
a
h Newren
R
ecommend git-fil
t
er-re
p
o instead of git-filter-b
r
anch
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-05
Elijah Newren
t60
0
6
: simplify, fix, and optimize empty message test
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-05
Elijah
N
e
w
r
e
n
t3427
:
accelerate this test
by usi
n
g
fast-export and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-01
Elij
a
h
Newren
merge-
o
ption
s
.
t
xt:
c
lar
i
fy
m
e
anin
g
of va
r
ious ff-related
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah
N
ew
r
en
merge-recursive
:
a
lph
a
beti
z
e include
l
i
st
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
E
lijah Newren
merge-recursive: add sanity checks for rel
e
va
n
t merge_options
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah
N
ewren
merge
-
r
ecursi
v
e
:
renam
e
MERGE_RECURSIVE_*
to MERGE_VARIANT_*
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
merge-recursiv
e
: split
inter
n
al fields int
o
a sepa
r
ate
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elij
a
h Newren
merge-recursive
:
avoid losing out
p
ut and leaking memor
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Eli
j
ah Newren
merge-r
e
cursive: co
m
ment an
d
reorder the merge_options
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
merge
-
recursive: co
n
solidate unne
c
essa
r
y fiel
d
s in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Eli
j
ah Newren
me
r
ge-recu
r
sive: move some definitions
around to clean
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
El
i
ja
h
N
ewren
me
r
ge-recursive: rename
m
e
r
ge_
o
ptions ar
g
u
ment to
opt
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah N
e
wren
me
r
ge-re
c
ursiv
e
: rename 'mrtree' t
o
'
r
esult_tree',
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elija
h
New
r
en
m
erge-recursive: use com
m
on name for ancestors/common
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah N
e
wren
m
erg
e
-recursive:
f
ix some
overl
y
l
ong lines
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Ne
w
ren
cac
h
e
-
t
r
e
e
: s
h
are
code between functions wr
i
ting an
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Ne
w
ren
merge-
r
e
c
ursive
:
do
n
't
f
o
rce external
c
allers to
d
o
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
mer
g
e-recursive: rem
o
ve useless paramete
r
in
m
e
r
ge_trees(
)
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
m
e
rge-recursi
v
e
:
exit early if index !=
hea
d
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newr
e
n
E
n
sure i
n
dex matches hea
d
before
invoking merge mac
h
inery
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
merge-recursive: remove
another i
m
plicit dependency
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah
Newren
merge-re
c
ursive: future-proof
update_file
_
flags(
)
a
g
ainst
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
E
l
i
jah
N
e
wren
me
r
ge-recur
s
ive: provide a better
l
abel fo
r
d
i
ff3 commo
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-16
Elijah Newren
merge-recu
r
sive: e
n
forc
e
opt->ancest
o
r !=
N
ULL w
h
en
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-16
El
i
jah Newren
c
h
eckout: provide bett
e
r
c
o
n
f
lict hunk d
e
script
i
on
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-16
Elijah New
r
en
merge
-
r
ecursive: be consis
t
ent with assert
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-16
Elijah
New
r
en
checkou
t
:
remove
duplicate code
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-12
Elijah N
e
wren
git-fast-import
.
txt
:
clarify tha
t
multipl
e
m
erge c
o
m
m
its
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-06
E
l
ijah N
e
wr
e
n
merge-r
e
cursi
v
e: avoid di
r
ectory re
n
ame d
e
t
e
ction in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-06-05
Elijah
N
e
wren
merge-recursive: restore accidentally drop
p
ed s
e
tting
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-05-14
Elijah Newren
fas
t
-export: do automati
c
reencoding of
c
ommit
m
essages
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-05-14
Elijah Newren
fast-export: differ
e
n
t
iate betwee
n
explicitly UTF-8
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-05-14
Elijah Newren
fa
s
t-exp
o
rt
:
avo
i
d
st
r
ipping enc
o
d
ing header if w
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-05-14
E
l
i
jah Newren
fa
s
t-im
p
ort:
s
upport '
e
ncodin
g
' commit header
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-05-14
E
l
ijah N
e
w
r
en
t9
3
50: f
i
x enc
o
ding te
s
t to
actuall
y
t
est reencod
i
ng
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-26
Elijah Newr
e
n
Ho
n
o
r core
.
p
re
c
omposeUnicode in more plac
e
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
E
l
i
jah Newre
n
merge-recursive: swit
c
h dir
e
c
t
o
r
y rename
detection
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Eli
j
ah N
e
w
ren
merge-rec
u
rsive: gi
v
e caller
s
of
handle_content_merge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah Newr
e
n
m
e
rge-recursive:
track informatio
n
associated with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
E
lijah
Newren
t6043: fix copied test description to
m
at
c
h its purpose
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Eli
j
ah Newren
merge-recursive: switch fro
m
(oid,mode) pairs to a
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah Newr
e
n
merge-recur
s
ive
:
c
l
eanup handle_r
e
name
_
*
f
u
n
ctio
n
s
i
g
natures
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah N
e
wren
merge-recurs
i
ve: tra
c
k
b
r
anc
h
where rename o
c
curred
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah Newren
merge-recur
s
iv
e
:
remo
v
e ren[12]_other fields from ren
a
me_c
o
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elija
h
Newren
m
erge-recursive: shrink re
n
ame_con
f
lict_info
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah Newren
merge-rec
u
rsive: move some struct
d
eclarat
i
ons togeth
e
r
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elija
h
Newren
merge-r
e
cursive: u
s
e 'c
i
' for rename_
c
onflict_info
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
E
lijah Newre
n
merge-recursive: rename loc
a
ls
'
o'
and 'a' to 'obuf
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
E
lijah Newren
merg
e
-recurs
i
ve: rename di
f
f_filespec '
o
ne' to 'o'
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah Newren
m
e
rge-r
e
cursive: rename merge_options argume
n
t from
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah
N
ewren
Use 'unsigned sho
r
t' for m
o
de, lik
e
di
f
f_files
p
ec does
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-01
El
i
jah Newre
n
fast-import: fix err
o
neo
u
s handling o
f
g
e
t-ma
r
k wit
h
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-01
Elijah Newre
n
fast
-
im
p
ort:
only allo
w
cat-blo
b
requests whe
r
e it
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-01
Elij
a
h Newren
fast-import:
che
c
k most prominen
t
commands
fi
r
s
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-01
E
l
ijah
N
ew
r
e
n
g
it-fast-import
.
txt: fix
w
ord
i
ng about w
h
er
e
ls comma
n
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-01
Elijah N
e
wren
t
9
300:
demonstrate bug with
g
e
t-mark and empt
y
o
r
p
han
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-02-21
E
lijah Newren
merge-options
.
txt
:
corr
e
ct wording of --
n
o-commit o
p
t
i
on
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-02-14
Elijah New
r
e
n
git-rebase
.
tx
t
: update to re
f
lect merge
now implemented
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-02-08
Elijah
Newren
log,diff
-
tree:
a
d
d
-
-combined-al
l
-paths option
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-01-10
Elijah Newr
e
n
git-sho
w
-r
e
f
.
txt:
f
ix
o
rder of flag
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-01-07
Elijah Newren
rebase:
i
mplement --m
e
rge v
i
a the interact
i
v
e
machinery
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Elijah Newren
rebas
e
: d
e
fi
n
e linear
i
zation ordering and
en
f
orce it
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
El
i
j
a
h
Newren
git
-
l
egacy-rebase: sim
p
lify unn
e
ce
s
sary triply-nested i
f
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Elijah Newren
git-
r
ebase, sequencer:
e
x
t
end --
q
uiet option for th
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Elij
a
h
Newren
am,
r
ebase
-
-merge: do not over
l
ook --skip'ed commits
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Elijah New
r
en
t5407
:
add a te
s
t demonstrating how inte
r
activ
e
handles
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Eli
j
ah
Ne
w
ren
rebase: fix inco
m
pa
t
ible opti
o
ns error message
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
E
l
ija
h
New
r
en
rebase
:
ma
k
e builtin and legacy script error mess
a
g
e
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-09
E
lij
a
h Newren
git-reb
a
se
.
txt:
u
pdate note ab
o
ut
d
irect
o
r
y
rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
E
lijah Newren
fast-
e
xport: add a --s
h
ow
-
ori
g
i
n
al-ids option to show
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah Newren
fast-import: remove unma
i
ntained duplicate documentatio
n
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
E
lijah
Newren
f
a
st-exp
o
rt: add --r
e
ference-excluded-parents
opt
i
on
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah Newren
f
a
st-expo
r
t: ensure we expo
r
t requested refs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next