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
Elij
a
h Newre
n
Fix spelling err
o
rs in documentation outsi
d
e of Documentation/
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-11-07
Elijah Newren
Documentati
o
n
: f
i
x a
b
un
c
h of typos, both old and new
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-10-08
Elijah
N
ewr
e
n
merge-re
c
ursive: fix the
f
ix to t
h
e diff3 common ancestor
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-10-03
Eli
j
a
h Newren
fast-exp
o
rt: h
a
ndle neste
d
tags
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-10-03
Elij
a
h Newre
n
t9
3
50:
add test
s
for tags of things
o
t
he
r
than a commit
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-10-03
Elijah
N
ewren
fast-expor
t
: allow user to reques
t
tags be
marked with
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-10-03
Elijah Newren
fast-export
:
add support for --import-m
a
rks-if-ex
i
sts
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-10-03
Elij
a
h
N
ewren
fast-imp
o
rt: add
support for
n
e
w 'ali
a
s
'
command
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-10-03
Elijah Ne
w
ren
fa
s
t-im
p
ort:
a
llo
w
t
a
g
s to
be identified by mar
k
labels
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-10-03
Elijah Newren
fast-
i
mp
o
r
t: fix handling of
d
elet
e
d tags
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-10-02
Elijah Newren
merge-recursive: fix the diff3 c
o
mmon anc
e
stor label
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-10-02
El
i
jah
Newren
dir: specia
l
case check for
t
he poss
i
b
i
lity that
p
athspec
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-09-28
Elijah Newren
f
ast
-
export:
f
i
x exp
o
r
ting a ta
g
and
no
t
hing else
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-09-17
Elija
h
Newren
clean: fix theo
r
etic
a
l p
a
th
cor
r
u
ption
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-09-17
Elija
h
Newren
clean: rewra
p
ove
r
ly long line
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-09-17
E
lijah Newren
clean: avoid removing unt
r
acked file
s
in a nested gi
t
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-09-17
Elija
h
Newr
e
n
cle
a
n: dis
a
mbiguate the definition of -d
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-09-17
Elijah Newr
e
n
git-c
l
ea
n
.
txt: do n
o
t claim
we will de
l
e
te file
s
wit
h
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-09-17
Elijah Newren
dir: add comm
e
ntary explaining match_pathspec
_
item
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-09-17
E
lijah Newren
dir: if our
path
s
pec
m
ight
match f
i
les u
n
der a dir
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-09-17
Elijah Newren
d
ir: make the DO_MATCH_SU
B
MOD
U
L
E
c
o
de reus
a
ble for
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-09-17
Elijah Newren
dir
:
also check directories for matchin
g
pa
t
hspecs
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-09-17
Elijah Newren
di
r
: fix of
f
-by-one error in
m
atch_pathspe
c
_item
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-09-17
Elijah Newr
e
n
dir: fix typ
o
in comment
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-09-17
Elijah Newr
e
n
t7300
:
add tes
t
cases
s
howing failure to clean specif
i
ed
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-09-05
Elijah N
e
wren
t9902: use
a
n
o
n-
d
ep
r
ecated comm
a
n
d
f
or
t
e
stin
g
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-09-05
Eli
j
ah Newren
Recommend git
-
fi
l
t
e
r
-
repo ins
t
ead
of git-filter-
b
ra
n
ch
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-09-05
El
i
j
a
h Newren
t
6
006: s
i
mplify, fix, and o
p
ti
m
ize empt
y
mes
s
a
ge test
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-09-05
Elija
h
Newren
t342
7
: a
c
celer
a
te
this test by u
s
i
n
g fast-exp
o
rt and
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-09-01
El
i
jah Newre
n
m
erge-
o
p
tions
.
txt:
clar
i
fy
meaning o
f
variou
s
ff-related
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
El
i
jah
Newren
merge-r
e
c
urs
i
ve: al
p
habe
t
ize i
n
clude
l
i
st
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newr
e
n
merge-recursive: add sanity c
h
ecks for rel
e
van
t
merge_
o
pti
o
ns
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
Elijah New
r
en
m
e
rge-
r
ecursive
:
rename
M
ERGE_REC
U
RSIVE_* t
o
M
E
RGE_VARIANT
_
*
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
me
r
ge-
r
ecursiv
e
: split internal fiel
d
s into
a
separate
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
Elijah New
r
en
merge-recurs
i
ve: avoid losi
n
g outpu
t
and leaking memory
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
E
lijah New
r
e
n
merge-recursi
v
e
:
comment and
r
e
o
r
der the merge
_
o
p
tions
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
Elija
h
Newren
merg
e
-r
e
cursive
:
cons
o
lidate unnecessary fiel
d
s in
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
me
r
ge-re
c
ursi
v
e: m
o
ve so
m
e
d
efinitions around
t
o clean
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
Eli
j
ah Ne
w
ren
merge-recursiv
e
: ren
a
m
e
merge_o
p
t
i
ons
a
r
gument to opt
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
El
i
jah
N
e
w
ren
merge-recu
r
sive: ren
a
me 'mrtree'
t
o 'resu
l
t_
t
r
e
e',
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
E
l
ijah
N
e
w
ren
merge-r
e
cursive: use common
n
a
me fo
r
ancestors/com
m
on
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
merge-recursive: fix som
e
overly
l
ong lines
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
cache-tree: share code betw
e
en func
t
ions writing an
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
El
i
jah New
r
en
merge-recursive: don't force external caller
s
to do
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
Elijah
N
e
wren
m
e
rge
-
rec
u
rsive:
remove us
e
less parameter
in merge_trees()
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
Elijah N
e
wren
mer
g
e-recursive: exit
early if index != hea
d
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
Ensure index matches head before invoking
m
erge machi
n
ery
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
Elijah
N
ew
r
en
merge-recursive: remove a
n
o
t
her implicit depende
n
cy
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
Elijah
N
ewre
n
me
r
g
e
-recursive:
futur
e
-proof up
d
ate
_
file_flags() agai
n
st
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
merge-recursive: provide a
b
etter label for d
i
ff3
common
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-16
Elijah Newren
merge-r
e
cursive: enfo
r
c
e
opt->ancest
o
r != NULL
when
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-16
El
i
j
a
h Newren
chec
k
o
u
t: pr
o
vi
d
e
b
ett
e
r conflict hunk
descri
p
tion
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-16
El
i
jah Newren
merge-recursive: b
e
c
o
nsistent
with a
s
sert
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-16
E
lija
h
Newren
checkout:
r
emove dupl
i
c
ate
cod
e
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-12
E
lijah Newren
g
i
t-fast-import
.
t
xt: clarify that mult
i
p
le me
r
ge c
o
mmits
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-06
E
lijah Newren
merge-recu
r
sive: avoid direc
t
ory rename detection in
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-06-05
Elijah Newren
merge-rec
u
rs
i
ve: rest
o
re accidentally dro
p
ped setting
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-05-14
Elija
h
Newre
n
f
a
st-e
x
por
t
: do a
u
to
m
atic reencodi
n
g o
f
co
m
mit m
e
ssage
s
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-05-14
Eli
j
a
h Newre
n
fast-export:
d
iff
e
rentia
t
e
b
e
t
we
e
n
explicitly UTF-8
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-05-14
Elijah
N
e
wre
n
fast
-
e
x
port: avoi
d
stripping e
n
codin
g
header i
f
we
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-05-14
Elijah N
e
wren
fast-import: support 'encoding' commit
he
a
der
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-05-14
Elijah Newr
e
n
t
9350: fix encoding test to actually test reen
c
oding
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-04-26
El
i
jah N
e
wren
Honor co
r
e
.
pre
c
om
p
o
s
eU
n
ic
o
de in more
places
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-04-08
Elijah Ne
w
ren
m
e
rge-re
c
ur
s
ive:
s
witch
directory re
n
am
e
d
e
tection
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-04-08
E
l
ijah Newren
m
e
rge-recursive:
give callers
of handle_conte
n
t_me
r
ge
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-04-08
Elijah Newren
merge-
r
ecursive: track information associated with
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-04-08
Elijah Newren
t6043: fix copi
e
d test
d
escription to match its pu
r
p
ose
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-04-08
Elijah Ne
w
ren
m
erge-
r
ecursive:
s
wit
c
h fro
m
(oi
d
,mode) pairs to a
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-04-08
Elijah Newren
m
e
rge-re
c
ursive: cleanup handle_rename_* function signatu
r
es
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-04-08
Elijah Ne
w
ren
merge-re
c
ursive:
t
ra
c
k
b
ranch where rename
o
ccurred
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-04-08
E
l
ijah New
r
en
m
e
rge-r
e
c
u
rsive: remove ren[12]_other fi
e
lds f
r
om rename
_
con
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-04-08
Elija
h
Ne
w
r
en
me
r
ge-recurs
i
ve: shrink ren
a
me_conflic
t
_
i
n
f
o
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-04-08
E
l
ijah Newren
merge-recursive: move
some st
r
uct de
c
l
arat
i
ons tog
e
t
h
er
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-04-08
Eli
j
a
h
N
ewr
e
n
merge
-
recursive: us
e
'ci' for r
e
name_conf
l
ict_inf
o
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-04-08
Elijah Ne
w
ren
merge-recursive: rena
m
e locals
'
o' and 'a' to 'obuf
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-04-08
Elijah Newren
m
erge-recursive: r
e
name
diff_files
p
ec 'one' to 'o'
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-04-08
E
lija
h
Newren
m
erge-recursive: r
e
name merge_op
t
ion
s
a
r
gument from
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-04-08
E
l
ijah Newren
U
s
e 'unsigned short' for mode, like diff_fil
e
spec
d
oes
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-04-01
Elijah Newren
fast-impo
r
t
:
fix erroneous handling of get-mark wi
t
h
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-04-01
E
lij
a
h
Newre
n
fast-i
m
port: only allow cat-blob reque
s
t
s
where i
t
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-04-01
Elijah
N
ewren
f
a
st-
i
mport
:
c
h
ec
k
mo
s
t prominent commands fir
s
t
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-04-01
Eli
j
ah Newren
git-
f
a
s
t-im
p
o
rt
.
t
x
t:
fix wording about where l
s
command
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-04-01
Elijah Newren
t9300: demonstrate bug with get-mark and empty orpha
n
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-02-21
Elijah Newren
merge-options
.
txt
:
co
r
rect wording of --no
-
commi
t
option
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-02-14
E
l
ij
a
h N
e
wren
git
-
r
e
ba
s
e
.
txt:
update to r
e
flect merge now implemented
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-02-08
Elijah New
r
en
log,diff-tre
e
: add
-
-comb
i
n
e
d-all-p
a
t
hs option
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-01-10
Elijah Newren
git-show
-
ref
.
t
xt: fix order of flags
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-01-07
Elijah
N
e
w
ren
reba
s
e: i
m
p
l
e
ment --me
r
ge via the inter
a
ctive machinery
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-12-28
Elijah Newre
n
rebase: define linearization ordering
a
nd
enforce it
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-12-28
Elijah Ne
w
ren
git-l
e
gacy-rebas
e
: simplify unnecessary tripl
y
-ne
s
ted if
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-12-28
Elijah Newren
git-rebase, s
e
q
u
encer:
e
xtend --quie
t
opt
i
on
f
or the
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-12-28
Elijah Newren
am, r
e
base--merge: do not overlook --skip'ed commits
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-12-28
Elijah
Newren
t54
0
7:
a
dd a test demo
n
strat
i
ng how interact
i
ve han
d
l
e
s
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-12-28
El
i
jah Newre
n
r
e
b
ase: fix inco
m
p
a
tib
l
e op
t
io
n
s error
m
essage
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-12-28
Elijah
Newren
rebase: make builtin and
lega
c
y
scrip
t
error messages
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-12-09
Elijah Newre
n
git-rebase
.
txt
:
up
d
ate note about dir
e
ctory rename
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-11-17
E
l
ijah Newren
f
ast-export
:
add a --show-original-i
d
s option to sh
o
w
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-11-17
Elij
a
h
Newren
fast
-
import: rem
o
ve unmaint
a
i
ned dupl
i
cate document
a
tion
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-11-17
Elijah Newren
f
ast-exp
o
rt:
a
d
d --referenc
e
-excl
u
ded-parents opt
i
on
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-11-17
Elija
h
N
ewren
fast-
e
xp
o
rt: ensure we export requ
e
sted
ref
s
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
next