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
Git 2.27-rc2
2019-11-02
Elij
a
h
N
e
wren
Rel
N
otes/2
.
24
.
0: fix
s
elf-
c
ontradict
o
ry note
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-11-02
Elija
h
New
r
en
RelNotes/2
.
24
.
0: typofix
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-23
Elijah Newren
t604[23
6
]: do not run setu
p
i
n
separate te
s
ts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-23
E
l
ijah Newren
merge-recursive
:
fi
x
merging a
s
ubdirectory into th
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-23
E
l
i
jah
N
ewren
merge-recu
r
sive: clean up
g
et_renamed_d
i
r
_
p
o
rti
o
n(
)
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-08
Elijah N
e
wren
merge-recursive
:
fix
t
he fi
x
to the diff3 co
m
mon ances
t
or
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
Eli
j
ah
Newren
fas
t
-export: handle nested tags
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
Elijah
Newren
t9350: add te
s
ts fo
r
t
a
gs o
f
t
hin
g
s other than a commit
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
Elijah
N
ewre
n
fast-expor
t
:
allow user t
o
r
equest
tags be mar
k
ed with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
Elija
h
Newren
f
a
s
t-
e
xport: add support for --im
p
o
r
t-mark
s
-if-exis
t
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
E
lijah Newren
fast-import:
add support for
n
ew 'alia
s
' comm
a
nd
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
Elijah Newren
fas
t
-i
m
port: allow t
a
gs
t
o be identified by mark
labe
l
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
Elij
a
h Newren
fa
s
t-import
:
f
i
x handling o
f
d
ele
t
ed
t
a
g
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-02
Eli
j
a
h Newren
m
erge-re
c
ursive: fix
the
diff3 comm
o
n ancestor label
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-02
Eli
j
ah Newren
dir: special case che
c
k for the pos
s
ibi
l
ity tha
t
pathspec
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-28
Elija
h
Newren
f
a
st-export:
f
ix
e
xport
i
ng a tag and nothin
g
else
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Eli
j
ah
N
e
wren
c
l
e
an: fix theoret
i
cal path corrup
t
ion
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah Newren
clean: rewrap overly long line
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
El
i
jah Newre
n
c
lean: avoid re
m
ovi
n
g un
t
rack
e
d files i
n
a nested git
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah Newren
clean: disambiguate the de
f
inition of -d
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah
Newren
g
i
t
-c
l
ean
.
txt
:
do n
o
t
c
l
aim w
e
will de
l
e
t
e
files with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah
N
e
w
ren
dir: a
d
d commen
t
ary explaining match
_
pat
h
spec
_
item
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elij
a
h Ne
w
ren
dir: if o
u
r path
s
pec might matc
h
files
unde
r
a dir
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah Newren
di
r
: make the DO_MAT
C
H_SUBMODULE code reusabl
e
for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah New
r
en
d
ir: also chec
k
dir
e
cto
r
i
e
s for
matching
p
ath
s
p
e
c
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah N
e
wre
n
dir: fix off-by-one error in matc
h
_pathspec_
i
tem
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
El
i
jah
N
ewren
dir: fix ty
p
o in
c
omment
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
E
lij
a
h
New
r
en
t7300: add
testcases
s
howing failur
e
to clean specified
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-05
El
i
jah Newr
e
n
t9902: use a non-
d
e
p
reca
t
ed command for testin
g
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-05
Elijah
Ne
w
ren
Recomm
e
nd git-filter-repo instead of git-filter-branch
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-05
El
i
jah Newren
t
6006:
s
implify,
f
ix, an
d
opti
m
ize
e
mpty message te
s
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-05
Elijah Newren
t3427: accelerate this
t
est by using fast-export and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-01
Elijah Newren
merge-opt
i
ons
.
txt:
c
larify meaning of vari
o
us ff-rel
a
ted
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elij
a
h Newren
merge-r
e
cursive: alphabet
i
ze include list
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Ne
w
r
e
n
merge-rec
u
rsive:
ad
d
sani
t
y checks for re
l
ev
a
n
t
merge_o
p
tions
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newr
e
n
merge-recursive:
r
ename MERGE_
R
E
C
UR
S
IVE_* to MERGE_VARIAN
T
_*
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
E
lijah Newren
merge-recu
r
sive: split interna
l
fields
into a separate
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
E
l
ijah
Ne
w
ren
merge-recurs
i
ve: avoid losing output and l
e
a
king memory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah N
e
w
ren
merge-recursive: comment
and reorder the m
e
rge_op
t
ions
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Eli
j
ah N
e
wren
merg
e
-recursive: con
s
olidate
unnecessary fields in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elija
h
Newren
m
erge-recurs
i
ve: move
some
defi
n
itions around to
clean
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
E
l
ijah
Ne
w
ren
merge-recur
s
i
v
e: rename merge_options ar
g
um
e
n
t
t
o
opt
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elij
a
h New
r
en
merge-recur
s
iv
e
:
r
e
name 'mrtr
e
e
'
to 'result_
t
ree',
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah
N
ewren
m
erge-recursive: use co
m
mon name
f
or ancestors/c
o
m
mon
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah New
r
en
m
e
r
ge-recursive: fix some overly
long li
n
es
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
E
lijah Newren
c
a
che-tree
:
share code betwe
e
n fun
c
tions
w
r
i
ting
a
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
m
erge-recursive: don't
f
o
r
ce
e
xternal
c
allers
t
o
d
o
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newr
e
n
m
e
rge
-
recursive
:
remove use
l
e
s
s
parameter in merge_tre
e
s()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Eli
j
ah New
r
en
mer
g
e-recursive:
exit
early
if index !
=
head
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
Ensure index matches head
b
efore invoking merge
m
achi
n
ery
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Eli
j
ah N
e
wren
merge
-
recursive
:
r
e
move another implic
i
t de
p
e
n
d
ency
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
El
i
jah Newre
n
me
r
ge-
r
e
c
ursive:
f
uture-proof
u
pd
a
te_file_fla
g
s
() a
g
ainst
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
E
l
ijah N
e
wren
me
r
ge-rec
u
rsiv
e
:
provide a
better
l
abel for
d
i
f
f
3
comm
o
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-16
Elija
h
N
ewren
merg
e
-recursive: enforc
e
opt->ancesto
r
!= NULL w
h
en
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-16
E
lijah N
e
wren
checkout
:
provide bett
e
r conflict hunk d
e
sc
r
iptio
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-16
Elijah Newren
merge-recurs
i
v
e: be consis
t
e
nt
w
ith ass
e
rt
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-16
E
l
ijah Newr
e
n
check
o
ut: remov
e
d
u
plic
a
te code
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-12
Elijah Newr
e
n
git-
f
ast-
i
m
p
o
r
t
.
t
xt
:
clarify tha
t
multiple merge
c
ommits
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-06
Elijah Newren
merge-
r
ec
u
rsive: avoid directory
rename d
e
t
e
ction in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-06-05
Elijah Newr
e
n
merge
-
recursive: resto
r
e
a
c
cident
a
lly drop
p
e
d set
t
ing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-05-14
Elijah Newre
n
fast-export: do autom
a
t
ic reencodi
n
g
of commit messages
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-05-14
Elija
h
N
ewren
fast-expor
t
: d
i
f
fere
n
t
i
at
e
be
t
w
e
en explicitl
y
U
TF-8
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-05-14
E
lij
a
h Newren
fast-export: avoid
stripping enco
d
ing hea
d
er if we
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-05-14
Elijah Newren
fast-import: support
'
encod
i
ng' commit header
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-05-14
Elijah
N
ewre
n
t9350: fix encod
i
n
g
test to actually test
r
een
c
odin
g
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-26
Eli
j
ah Newren
Honor
core
.
precomposeUnicod
e
in
m
o
r
e
pl
a
ces
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elij
a
h
N
e
w
r
e
n
merge-rec
u
rsive: switch directory rename
d
et
e
ction
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah Newre
n
merge-recursi
v
e: giv
e
c
a
llers of
h
a
ndle_
c
ontent
_
m
erge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
E
l
i
j
a
h
Newren
mer
g
e-recur
s
ive:
track i
n
formation associate
d
with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elija
h
Newr
e
n
t
6043: fix copie
d
t
e
st descr
i
ption to match
its purpose
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah Newren
merge-re
c
u
r
sive: s
w
i
tch from (oid,mode)
pairs to a
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah Newre
n
merg
e
-r
e
cursive:
c
leanup ha
n
dle_
r
ename_* function sig
n
atures
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah Newren
merge-recursive:
t
rack
b
ranch whe
r
e rename occu
r
red
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah Newren
merge-recursiv
e
: remove ren[12]_othe
r
f
ields from rename_con
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah Newren
merge
-
r
ecursive: shri
n
k renam
e
_conflic
t
_info
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
El
i
jah Ne
w
ren
merge
-
re
c
ursive: move so
m
e
st
r
uc
t
decla
r
atio
n
s together
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah Ne
w
ren
m
erge-recursive: u
s
e
'
c
i
' fo
r
ren
a
me_confl
i
c
t
_info
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
E
lijah
New
r
en
merge-recursive: r
e
name loca
l
s 'o' and 'a' to
'obuf
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah Newr
e
n
merge-recursi
v
e: rename d
i
ff_f
i
lespec 'one'
to 'o
'
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
El
i
jah Newren
mer
g
e
-
r
ecursiv
e
:
ren
a
me merge_options
a
rgument from
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Eli
j
a
h Newren
Use 'unsigned
short' for
m
ode, like diff
_
filesp
e
c does
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-01
El
i
jah Newre
n
fast
-
import
:
fix
e
r
r
oneous handling of get-mark with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-01
Elijah Newren
fast-imp
o
rt: only allow c
a
t
-
b
lo
b
requests where it
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-01
Elijah Newren
fas
t
-
import: check m
o
st prominen
t
commands f
i
rst
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-01
El
i
j
a
h Newre
n
git-fast-import
.
txt: fix wording about whe
r
e ls comma
n
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-01
E
lijah
Newren
t9300: demonstrate bug with get-m
a
rk
a
nd empty orp
h
an
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-02-21
Elija
h
Newr
e
n
merge-opti
o
ns
.
t
x
t: co
r
rect wording of --
n
o-comm
i
t optio
n
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-02-14
E
l
i
jah Newren
git-rebase
.
txt: update t
o
reflect merge n
o
w implemented
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-02-08
Elijah Newren
log,diff-tree: ad
d
--combined
-
all-path
s
option
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-01-10
Elijah Newren
git-s
h
o
w-ref
.
t
x
t:
f
ix
order o
f
flag
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-01-07
E
lijah Newren
rebas
e
: implement --merge
v
ia th
e
interactiv
e
mac
h
inery
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
El
i
jah New
r
en
rebase: define linearization ord
e
ring
a
nd
e
nforce it
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
El
i
jah Newren
git-legacy-rebase
:
sim
p
lify unnecessary triply-ne
s
ted if
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Elijah Newren
git-r
e
base, seque
n
cer: e
x
t
e
n
d
--quiet option for the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
E
lijah
N
ewren
am, rebase--merge: do not overlook
-
-skip'ed commits
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Elijah Ne
w
ren
t5407:
a
dd a tes
t
d
e
m
o
nstrating how interactive handl
e
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
E
lijah Ne
w
ren
r
ebase: fi
x
in
c
o
mpatible options erro
r
message
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
E
l
i
jah
N
ewren
r
e
base: make builtin
and
legacy s
c
r
ipt error messages
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-09
Elij
a
h Newr
e
n
g
i
t-rebase
.
txt: upd
a
te no
t
e a
b
out dire
c
tor
y
rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
El
i
jah
N
ewren
fast-export: add
a --show-ori
g
inal
-
ids opti
o
n to show
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next