repo.or.cz
/
git
/
raj.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
The fifth batch
2019-11-10
Elijah Ne
w
re
n
Fix spelling errors
i
n
comments of
testca
s
e
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-11-10
Elijah Newren
Fix spelling errors in code comments
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-11-07
Eli
j
ah Newren
t6024: modernize style
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-11-07
Elijah Newren
name-h
a
sh
.
c
:
remove duplicate wo
r
d i
n
co
m
ment
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-11-07
Eli
j
ah Newren
hashmap
:
fix docum
e
ntat
i
on
misuses o
f
-
> versus
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-11-07
El
i
j
ah
Newren
git-filter-branch
.
txt: corr
e
ct argument n
a
me typ
o
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-11-07
Elijah Newren
Fix spel
l
ing errors in documentation out
s
ide of Doc
u
ment
a
tion/
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-11-07
Elijah Newren
Documentation:
f
ix a b
u
nch
of typos, both old and
n
ew
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-11-02
Elijah
N
ewren
RelNot
e
s/2
.
24
.
0
:
fix self-contradic
t
ory note
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-11-02
E
li
j
ah Newre
n
RelNotes/2
.
24
.
0:
typ
o
f
i
x
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-23
El
i
jah Newren
t60
4
[23
6
]: do
no
t
run setup
i
n
sepa
r
ate
t
ests
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-23
El
i
j
a
h
Newren
merge-
r
ecurs
i
ve: fix mergi
n
g a subdirectory into
t
h
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-23
Elija
h
Newren
merge-recursi
v
e: clean up get_renamed_dir_po
r
t
i
on(
)
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-08
El
i
jah Newren
merge-recu
r
s
i
ve: fix th
e
f
ix to th
e
diff3 commo
n
a
n
ce
s
tor
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
Elijah Newren
fast-expo
r
t: h
a
ndle nested tags
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
Elija
h
Newren
t9350: add tests f
o
r
t
ags of things
other than a
commit
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
Elijah N
e
wren
fast-export:
a
llow user
t
o req
u
est tags be
m
arked wit
h
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
Elijah
Newren
fa
s
t-exp
o
rt
:
add support for --impo
r
t-marks-
i
f-exi
s
ts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
Elijah Newren
fast-i
m
po
r
t: add support for new
'
a
l
ias' c
o
mmand
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
Elijah
Newren
fa
s
t-impo
r
t: allow tags to be identified by m
a
rk labels
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
Elijah
N
ewren
f
a
st-import: f
i
x
handli
n
g o
f
d
e
let
e
d ta
g
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-02
Eli
j
ah Newren
merge-recursiv
e
:
f
i
x the diff3 common ancestor label
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-02
El
i
jah Newr
e
n
dir: special case check for
t
he poss
i
bility th
a
t path
s
pec
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-28
E
lijah
Newre
n
fast-e
x
port: f
i
x
e
x
porting
a
tag an
d
nothing el
s
e
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah Newren
c
l
ean: fi
x
theoretical pat
h
corr
u
ption
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 removi
n
g untrack
e
d
f
ile
s
i
n
a neste
d
git
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
E
li
j
ah Newren
c
l
ean: disambiguate t
h
e d
e
fin
i
tion of
-
d
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
E
l
ijah Newren
git-clean
.
txt
:
do n
o
t claim w
e
will
delete fil
e
s
w
i
th
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah N
e
wren
dir: add commentary explain
i
ng match_pathspec_
i
tem
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Eli
j
ah Newren
dir: if our pathspec might
match
files und
e
r a dir
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah Newren
d
ir: make the DO_MATCH_SUBMO
D
ULE
c
ode reusable for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah Newr
e
n
d
ir: also
check dir
e
ctories for
m
a
tching pat
h
specs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
E
l
ijah Newren
dir:
f
ix off
-
b
y-one er
r
or in match_pathspec_item
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah Newren
di
r
:
f
ix typo
in com
m
ent
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah Newren
t7
3
00: ad
d
test
c
a
s
e
s s
h
owing failure to clean sp
e
cified
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-05
El
i
jah Newren
t9902: us
e
a non-deprecated command for testi
n
g
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-05
Elijah Ne
w
r
e
n
Recommend git-filter-repo instea
d
of gi
t
-fi
l
ter-branch
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-05
E
l
ijah Newren
t6006:
simp
l
ify, fix, and optimize empty message tes
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-05
Elijah Newre
n
t
3
427: accelerate this tes
t
b
y
using fast
-
exp
o
rt a
n
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-01
E
l
ijah Newre
n
m
e
r
ge-optio
n
s
.
txt:
c
l
arify meaning
o
f
v
ari
o
us
ff-related
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
E
l
i
jah Newren
merge-r
e
cursive:
al
p
habet
i
ze include list
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah
Newren
merge-recu
r
sive
:
add s
a
nity che
c
ks for relevant merge_options
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Ne
w
ren
m
e
r
g
e-recursive: renam
e
MERGE_RECURSIVE_*
t
o MERGE
_
VARIANT_*
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
merge-rec
u
rsive:
s
plit internal fields into a separat
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
merge-
r
e
c
u
rsive
:
avo
i
d l
o
sin
g
output
and leak
i
ng memor
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elij
a
h
Newren
merge-
r
ecursive: comment and
re
o
rder the merge_options
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elija
h
Newren
merge-recursive
:
c
onsolidate
unneces
s
ary f
i
elds
i
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah N
e
wren
merge-rec
u
r
s
ive: move
s
o
me d
e
finitions around to cl
e
an
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elij
a
h N
e
wren
me
r
ge-rec
u
rsive: renam
e
merge_options argumen
t
to opt
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
merge
-
recursive: rename 'mrtree' to 'result_tree',
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
E
lijah Newren
merge-recursive: use
c
ommo
n
name fo
r
ancesto
r
s
/
common
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
E
lijah Newren
merge-recursive: fix some overly long l
i
nes
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah
N
ewren
cache-tree: share code
b
etween fu
n
ctio
n
s
w
riting an
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newre
n
merge-re
c
ursive: don't force ex
t
ernal callers to do
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Eli
j
ah
N
ewren
m
erge-recurs
i
ve: remove u
s
eless para
m
ete
r
i
n
m
e
r
g
e
_t
r
ees()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elij
a
h Newren
merge-re
c
ursive:
e
x
it ea
r
ly if index
!= h
e
ad
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah
Newren
Ensure
index matc
h
e
s
h
ead befor
e
invoki
n
g merge
m
achinery
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Eli
j
ah Newren
merge-rec
u
rsive:
r
e
move a
n
oth
e
r
i
mplicit depe
n
den
c
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah
Newren
m
erge-recursive: future-proof update_file
_
flags() against
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
merg
e
-recursi
v
e: provi
d
e a
b
etter la
b
el for diff3
common
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-16
Elij
a
h Newren
merge-r
e
cursive: en
f
orce opt->a
n
c
e
s
to
r
!=
NULL when
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-16
Elijah
Newren
checkout: provid
e
better conflict hunk desc
r
iption
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-16
El
i
jah New
r
en
m
erge-re
c
ursive: be consiste
n
t with assert
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-16
Elijah Newren
c
heckout: remove
duplicate code
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-12
Elijah Newren
git-fast-impo
r
t
.
t
xt: c
l
arify t
h
at
m
ultiple
m
e
r
ge com
m
i
ts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-06
El
i
jah Newr
e
n
merge-r
e
c
u
r
sive: avo
i
d
d
irectory
rename detection in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-06-05
Elijah Ne
w
ren
m
er
g
e-re
c
ursive:
r
estore accidentally dropped setting
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-05-14
Elijah Ne
w
ren
fast-export: do automatic r
e
encoding of
co
m
mit m
e
s
sages
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-05-14
Elijah Newre
n
fast
-
e
xport: differen
t
i
ate
between explicitly UTF
-
8
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-05-14
E
l
i
jah Newren
fast-
e
xp
o
rt: avoid stripping
en
c
oding
h
e
ad
e
r if
we
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-05-14
Elijah Newren
fast-import:
s
upport 'encoding' commit hea
d
er
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-05-14
Elijah New
r
en
t
9350: fix enco
d
ing tes
t
to
a
ctually
t
est re
e
n
codi
n
g
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-26
Elijah New
r
en
Honor core
.
preco
m
poseUnico
d
e
in mo
r
e places
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah Newren
merge-recursive: swit
c
h dire
c
tory r
e
name dete
c
t
ion
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah New
r
en
me
r
ge-recursive:
g
ive callers o
f
handle_c
o
ntent_merge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
El
i
jah Newr
e
n
mer
g
e-rec
u
rsive: tr
a
ck
information
assoc
i
at
e
d with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah Newre
n
t6043: fix co
p
ied test description
t
o match its purpose
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Eli
j
a
h
N
ewren
merge-recu
r
s
i
ve: swit
c
h
fro
m
(oid
,
mode) pairs to
a
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah
N
ewr
e
n
merge-recursi
v
e: cleanu
p
h
a
n
dle_rename_* functi
o
n
s
ignatu
r
es
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah N
e
w
r
e
n
merge-rec
u
rsive: trac
k
branch
wher
e
renam
e
occurred
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
E
l
i
j
a
h New
r
en
merg
e
-rec
u
rsive: rem
o
ve ren[12]_other fields fr
o
m
r
e
name
_
con
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah Newren
m
e
rge-re
c
urs
i
ve: shrink ren
a
me_conflict_info
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
E
lijah New
r
en
merge-
r
ecu
r
sive:
move some struct declarations
together
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elija
h
N
e
w
re
n
merge-recu
r
sive: use 'ci' fo
r
rename_co
n
flict_info
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah Newren
merge-recursive:
rename loca
l
s
'o' and
'
a' to 'ob
u
f
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah Newr
e
n
mer
g
e
-recursive
:
rena
m
e
d
iff_files
p
e
c
'one
'
to 'o'
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah Newren
merg
e
-recursi
v
e: rename me
r
ge_opt
i
on
s
argume
n
t from
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
El
i
jah N
e
wren
Use 'unsigned
s
hort'
for
m
ode, like dif
f
_filespec does
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-01
Eli
j
ah Newre
n
fast-import: f
i
x erroneou
s
handling of get-mark with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-01
Elija
h
Newr
e
n
fas
t
-import: only allow ca
t
-blob requ
e
sts where it
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-01
Elijah
N
ewren
fas
t
-i
m
por
t
:
c
heck most prominent
comm
a
nds first
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-01
Elij
a
h Ne
w
r
e
n
gi
t
-fas
t
-import
.
txt: fi
x
wording ab
o
ut where ls comman
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-01
Elijah Newren
t9300: demonstrate bug with
get-mark
and
empty orphan
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-02-21
E
l
ijah N
e
wren
mer
g
e
-
o
ptions
.
txt: corre
c
t
wor
d
i
ng of --no-
c
ommit opt
i
o
n
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-02-14
Elija
h
Newren
git-reb
a
se
.
txt: up
d
a
te to reflect merge now
i
mple
m
ente
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-02-08
El
i
jah
N
ewren
log,di
f
f-tree: add --comb
i
ned-a
l
l-p
a
t
h
s option
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-01-10
Elijah
N
e
w
ren
git-show-ref
.
txt: fix or
d
er of
f
lags
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-01-07
Eli
j
ah New
r
en
rebase: imple
m
e
nt --mer
g
e via th
e
inter
a
ctive mac
h
i
nery
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Elijah Newren
rebase: define l
i
neariz
a
tion ordering and
e
n
force it
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next