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
Fix spelling errors in documentation outside of Documentation/
2019-11-07
Elijah
Ne
w
ren
Fix spelling erro
r
s
in documen
t
a
t
ion ou
t
si
d
e
of Documentation/
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-11-07
Elijah Newren
Documentation:
fix a
b
unch
of
t
ypos, both old and new
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-08
Elijah Newr
e
n
merge-recursive: fix the fix to the
d
iff3 common
a
ncestor
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
Elij
a
h Newr
e
n
fast-expo
r
t:
handle n
e
sted ta
g
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
El
i
jah Newren
t9350: add t
e
s
ts for tags of t
h
ings
o
ther than a commit
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
Elijah Newren
fast-
e
x
p
ort: allow user
to req
u
est tags be marked with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
Eli
j
ah Ne
w
r
en
fa
s
t-export: add supp
o
rt for --import-marks-
i
f-
e
xists
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
Elijah
N
ewren
fast-import: add su
p
port fo
r
new 'alias' comman
d
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
Elijah Newren
fast-import: allow tags
to be identifi
e
d by mark labels
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
Elijah New
r
e
n
f
ast-import: fix ha
n
dling of
d
eleted tag
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-02
Eli
j
ah
Ne
w
ren
merge-recur
s
ive: fix the diff3 common a
n
ce
s
tor label
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-02
Elijah Newren
d
i
r
: special
c
a
se che
c
k fo
r
the
poss
i
bility tha
t
pathspec
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-28
Elijah
N
e
w
ren
f
ast-expor
t
: fix exportin
g
a tag and no
t
hi
n
g else
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
E
l
ijah Newre
n
cle
a
n: fix th
e
oretical path corr
u
ption
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah N
e
wren
clean
:
r
e
wrap overly long line
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah Newren
clean: avoid rem
o
ving un
t
racked fi
l
es in a nested git
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah Newren
clean: disambiguate the
d
efin
i
tion of -d
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah Newren
git-c
l
ean
.
txt: do not c
l
aim we will
d
e
let
e
f
i
l
es with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah Newren
dir: ad
d
commentary expla
i
ning match
_
paths
p
ec_item
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elija
h
N
e
w
r
en
dir: if
our pathspec might
m
atch files unde
r
a
d
ir
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elija
h
Newre
n
dir: make the DO_MATCH_SUBMODULE code re
u
s
able for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
E
l
ijah Ne
w
ren
dir: also ch
e
c
k
directori
e
s for
m
atching
p
athspecs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
E
lijah Newren
d
i
r: fix off-by-one error in match_pathspec_item
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah Newren
dir: fix typo
i
n
c
o
mme
n
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah Newren
t7
3
00: add testcases showing failure to cle
a
n specified
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-05
Elija
h
Newren
t9902:
use
a non-de
p
recat
e
d command for testin
g
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-05
Eli
j
ah Newren
Recommen
d
git
-
filter-repo
i
nstea
d
of git-f
i
lter-b
r
anch
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-05
E
l
i
j
ah Newren
t6006:
s
implify,
f
ix, and opt
i
mize
e
mpty message test
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-05
Eli
j
ah New
r
e
n
t3427: ac
c
elera
t
e this test b
y
u
sing fast-e
x
po
r
t
and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-01
Elijah Newren
merge-options
.
txt: clarify
m
eaning
o
f
v
a
r
iou
s
ff-related
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
E
l
ijah Newren
merge-r
e
cursive: alphabeti
z
e include list
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elija
h
Newren
m
e
r
ge-recursive
:
ad
d
san
i
ty
c
heck
s
f
o
r relevant
m
e
rge_o
p
tions
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
El
i
jah Newren
mer
g
e
-rec
u
rsive: rename
M
ERGE_
R
ECURSIV
E
_* to MERGE_
V
ARIANT_*
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah N
e
wren
merge-recurs
i
v
e: spl
i
t int
e
r
nal f
i
elds in
t
o a
separat
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elija
h
Newren
me
r
ge-recursive: avoid losing output
a
nd leakin
g
m
emory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Eli
j
ah
N
e
wren
merge-rec
u
rsive: co
m
ment and reorder t
h
e merg
e
_optio
n
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
E
l
ijah Ne
w
ren
merge-recursive: c
o
nsolida
t
e unn
e
cessary fields i
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
El
i
jah Ne
w
ren
merge-recursive: move some d
e
finitions around
t
o clean
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
m
e
rge-rec
u
r
s
i
v
e:
r
e
name merge_
o
ptions
argument to opt
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Eli
j
ah Newren
merge
-
r
ecurs
i
ve:
rena
m
e 'mrtree'
to
'
res
u
l
t
_t
r
ee',
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
El
i
ja
h
Newren
merge-recursive
:
use common name for ancestors
/
comm
o
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah 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 Ne
w
ren
c
ache-tree: s
h
are code between functions writi
n
g
an
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Eli
j
a
h
Newren
merge-
r
e
c
ur
s
i
v
e: don't force
exte
r
nal c
a
llers to do
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah N
e
wren
merge-r
e
cursive:
remove useless parameter
in m
e
rge
_
trees(
)
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
E
lijah New
r
en
merge-r
e
cursive: exit early if index != head
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
E
lijah Ne
w
ren
Ensure index
m
atches
head before invoking merge machinery
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elija
h
Newren
me
r
ge-rec
u
rsive: re
m
ove ano
t
her implicit dependen
c
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
E
l
ij
a
h
N
e
wren
me
r
ge-recursive:
fu
t
u
re-p
r
oof update_
f
ile_flags()
a
gain
s
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
m
e
r
g
e
-
recursive: p
r
ovide
a
b
e
tte
r
label for d
i
ff3 common
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-16
El
i
jah Newren
m
erge-recursive: enforc
e
opt->ance
s
tor != N
U
LL whe
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-16
Elija
h
N
e
wren
ch
e
ckout
:
p
rovide b
e
tter co
n
flict
h
u
nk
d
e
s
criptio
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-16
Elijah Newren
me
r
ge-recur
s
ive: be co
n
s
i
s
t
e
n
t wi
t
h ass
e
rt
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-16
Eli
j
ah Newren
checkout: remo
v
e duplica
t
e code
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-12
Elijah
N
ewren
git-fast
-
i
mport
.
txt: clarify
that multiple merge com
m
its
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-06
Elijah Newren
merge-recursive: avoid directory renam
e
de
t
ecti
o
n
in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-06-05
E
lijah Newr
e
n
merge-r
e
cursive: restore
a
cci
d
entally
d
ropped settin
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-05-14
Elija
h
Newren
fast
-
export: d
o
a
u
t
o
matic reencodin
g
o
f co
m
mi
t
me
s
sages
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-05-14
E
l
ija
h
N
e
w
ren
fa
s
t-export:
differentiate between explici
t
ly
U
TF-8
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-05-14
E
lijah Newren
fast-export:
a
v
o
id
s
tripping encodin
g
hea
d
er if we
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-05-14
E
li
j
ah
N
ewren
fast-import:
s
u
p
p
o
rt 'encoding' commit header
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-05-14
Elijah Newren
t935
0
:
fix encoding
t
est to actuall
y
te
s
t
r
eencoding
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-26
Elijah Newren
Honor cor
e
.
pre
c
o
mposeUn
i
c
o
d
e
i
n more
places
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
E
lijah
N
ewren
merg
e
-
r
e
cu
r
sive: switch dir
e
ctory rename dete
c
tio
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
E
lijah Newren
merge-recursive:
giv
e
callers of
h
a
ndle_content_merge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elij
a
h
Newren
merge-rec
u
rsive: track information associated
w
ith
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah N
e
wr
e
n
t
6
0
4
3:
fix c
o
pied test
des
c
ription to match its pur
p
ose
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
E
li
j
a
h
N
ewre
n
merge-recursive: switc
h
from (oid,mode) p
a
i
r
s to a
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah
Newren
mer
g
e-recursive:
cl
e
an
u
p handle_rename
_
* functi
o
n signatures
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah Newren
merge-recur
s
ive: track
b
ranch where rename occurred
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Eli
j
ah Newren
merge-recursive:
r
emove r
e
n[12
]
_oth
e
r fi
e
lds from rename_con
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
E
l
ijah
Newren
merg
e
-rec
u
rsive: shrink rename_con
f
lict_info
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
El
i
j
a
h
Newren
merge-
r
ecursive: mov
e
some
struct dec
l
arations together
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Eli
j
ah Newren
merg
e
-recursive
:
use
'
ci
'
for rename_conflict_info
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
E
lija
h
N
ewren
me
r
g
e-recursive: rename l
o
ca
l
s
'o
'
and
'
a'
t
o
'obuf
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Eli
j
a
h Newren
merg
e
-recursive: rename di
f
f_filespec 'one' to 'o'
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
E
l
i
jah Newren
merge-rec
u
rsiv
e
: rename merge_options argument from
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah
Ne
w
r
e
n
Use 'unsigned s
h
ort' for m
o
de, l
i
ke
d
iff_f
i
lespec does
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-01
Elijah Newr
e
n
f
a
st-import: fix erro
n
eous handling of
get-ma
r
k
wit
h
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-01
Elijah
N
ewren
fast-import: on
l
y a
l
low cat-blo
b
requests whe
r
e
it
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-01
Elijah Newren
fast-import: check most p
r
omin
e
nt commands
first
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-01
Elijah Newr
e
n
git-f
a
st-import
.
t
xt
:
fix wording
about where ls c
o
mmand
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-01
Elijah Newren
t9300: demonstrate bug w
i
th get-mark and empty o
r
phan
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-02-21
Elijah New
r
en
merge-o
p
t
i
ons
.
txt: correct wo
r
di
n
g of
-
-no-com
m
it
o
ption
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-02-14
Elijah Newren
git-rebase
.
txt: update to reflec
t
m
erge now implemented
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-02-08
Elijah New
r
en
lo
g
,diff-tree:
add --combined
-
all-paths o
p
tion
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-01-10
Elija
h
Newre
n
git-s
h
o
w
-ref
.
txt: fix ord
e
r of
fla
g
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-01-07
Elijah Newren
reba
s
e: implement
-
-mer
g
e via the interactiv
e
machin
e
ry
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Elijah
Newren
rebase: d
e
fine
lineariza
t
ion
o
r
d
ering a
n
d
e
n
force it
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Elij
a
h Newren
git-le
g
a
c
y-rebase: simplify
un
n
ecessar
y
tr
i
ply-nested if
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Elijah Newr
e
n
git-rebase,
s
equencer: extend --
q
u
iet option for the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
El
i
jah Newren
am, rebase--merge:
d
o not
o
verlook --skip'ed com
m
its
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Elijah Newren
t5407: add
a
test demonstrating how interac
t
ive ha
n
dl
e
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
E
l
ijah N
e
wren
rebase: fix incompatible options error
m
essage
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Elijah Newre
n
r
e
base: make builtin
a
n
d legacy s
c
ript error messages
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-09
El
i
jah New
r
e
n
g
i
t-rebas
e
.
txt:
update no
t
e about directory r
e
name
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elij
a
h
N
ew
r
e
n
fast-
e
xport: add
a --
s
how-original
-
ids o
p
tion to show
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
E
l
ijah Newren
fast-impor
t
: remove unmaintain
e
d duplicate d
o
cume
n
tation
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah Newren
fast-export:
a
dd --referen
c
e-
e
xcluded
-
pa
r
ents
o
ption
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Eli
j
ah Newren
fast-expo
r
t: ensure we exp
o
rt requested refs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next