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
t3206: s/expected/expect/
2019-11-02
Elijah Newren
RelNotes/2
.
24
.
0: fix self-co
n
tradictory note
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-11-02
Elijah Newren
Re
l
Notes/2
.
24
.
0: typofix
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-23
El
i
jah Newren
t604[236]: d
o
n
o
t run
s
etup in separ
a
te tes
t
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-23
Elij
a
h N
e
w
ren
m
e
r
ge-recursi
v
e:
f
ix
merging a s
u
b
d
irectory
i
nto t
h
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-23
E
l
ijah Newren
m
e
r
g
e
-
r
ecurs
i
ve: clean up get_rena
m
ed_dir_portio
n
()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-08
Elijah N
e
wren
merge
-
recursive:
f
ix the fix to
th
e
diff3 c
o
m
mon ancestor
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
Elijah
N
ewren
fa
s
t-export: handle nes
t
ed
t
ags
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
E
l
ij
a
h Newre
n
t9350: add tests fo
r
t
a
g
s of things other th
a
n a commit
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
Elijah Newren
fas
t
-export: allow us
e
r to request tags be marked w
i
th
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
Elijah
N
ew
r
e
n
fast-ex
p
o
rt: add
support
for --
i
mport-mark
s
-if-
e
xists
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
Elija
h
Newren
f
ast-import: add support for new
'
a
l
ias'
c
ommand
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
E
l
ijah
New
r
e
n
fast-import: allow tags
to be identif
i
ed by mar
k
labels
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
Elijah N
e
wren
fast-import: fix handl
i
ng of deleted ta
g
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-02
E
lijah
Newr
e
n
merge-recursive:
f
ix the diff3
common ancestor
l
ab
e
l
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-02
E
lijah Newren
d
ir:
specia
l
ca
s
e check for the
p
ossibility t
h
at pathspec
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-28
El
i
j
ah Newren
fa
s
t-ex
p
ort: f
i
x exp
o
rting a tag and nothi
n
g else
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah Newren
c
l
ean
:
fix theo
r
etical pa
t
h co
r
rupt
i
on
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah
Newren
clean: re
w
rap overly long l
i
ne
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
El
i
jah Newren
clean: avoid removing untracked files in a
n
e
sted
git
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
E
l
ijah Newren
clean: disambiguate t
h
e
d
efinition
of -d
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elija
h
New
r
en
git-cle
a
n
.
txt:
do
n
ot claim w
e
will delete
fi
l
es with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
E
lija
h
Newren
dir: add
c
omment
a
r
y
expl
a
ining match_
p
a
t
hsp
e
c_item
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
E
lijah Newren
dir: if our pathspec might ma
t
ch fi
l
es under
a dir
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah Newr
e
n
dir: make the DO
_
MA
T
CH_
S
UBMODULE co
d
e reusable for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah Newren
dir: also check dir
e
ctories f
o
r
matching pathspecs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Eli
j
a
h
N
e
wren
dir
:
fix off-by-on
e
err
o
r in mat
c
h_pathspec_item
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah Newr
e
n
dir: fix typo in
c
omment
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah Newren
t7
3
00: add testcases
s
howing fai
l
u
re
to clean specified
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-05
Elijah Newren
t990
2
: use a
n
o
n
-depreca
t
ed command for testing
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-05
E
lijah N
e
wren
Recommend git-filter-repo instead of git-filter
-
b
ranch
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-05
Elijah Newren
t
60
0
6: simpli
f
y, fix, an
d
op
t
imize empty message test
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-05
Elijah Newren
t3427:
acceler
a
te this test by u
s
ing fast-export and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-01
Elijah Newren
merge
-
options
.
txt: c
l
ari
f
y meaning of
v
arious ff-related
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah
Newren
m
e
rge-recursiv
e
: alphabetize include list
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Ne
w
ren
m
erge-recursi
v
e: add sanity checks for
relevant merge_
o
ption
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
E
l
ijah Newren
merge-recursive
:
rename
MERGE
_
REC
U
RSIVE_* to MERGE
_
VARIAN
T
_
*
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
E
lij
a
h Newren
merge-re
c
ursive: split i
n
ternal fields into a separa
t
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
merge-rec
u
r
sive: avoid los
i
ng
o
u
tput and lea
k
ing memory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Eli
j
ah Newr
e
n
me
r
ge-rec
u
rsive: comment and
r
e
o
rder the merge_options
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
E
lij
a
h
Newren
merge-
r
ecursive: consolida
t
e unnecessary
f
i
e
lds in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
El
i
jah Newren
merg
e
-recursive: move some
d
e
finitions around to clean
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
m
e
r
ge-r
e
cursive: rename m
e
rge_o
p
tio
n
s
arg
u
m
e
nt to opt
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
m
erge-recur
s
ive: rename 'mrtree' to 're
s
u
l
t_tree',
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
El
i
jah Newren
merge
-
recursive:
u
s
e c
o
mmon na
m
e
f
or a
n
cestors/
c
ommon
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
merge-
r
ecursive:
f
ix som
e
o
v
e
rly long
l
ines
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
El
i
jah Newren
cac
h
e-
t
ree: share code between
f
unctions writing
a
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah
Newren
m
e
rge-r
e
cursive: don
'
t f
o
rce exter
n
a
l callers
t
o do
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
merge
-
r
ecursive:
remove usele
s
s parameter
in merg
e
_tre
e
s()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
E
l
i
jah
N
ewren
me
r
g
e-recur
s
ive:
exit early if index != head
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Eli
j
ah Newren
Ensure
i
ndex matches head before
i
nvoking me
r
ge machinery
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elija
h
Newren
merge-recurs
i
v
e
: remove another impl
i
cit dependency
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
E
lijah N
e
wr
e
n
mer
g
e-recurs
i
v
e
: future-proo
f
upd
a
te_file_flags()
against
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
merge-recursive
:
prov
i
de a b
e
tte
r
label for diff3
c
om
m
on
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-16
E
lijah Newren
mer
g
e-recu
r
sive
:
enforce opt->an
c
e
stor != NULL whe
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-16
Elijah Newr
e
n
che
c
kout:
p
rovide better c
o
nflict hunk
d
esc
r
iption
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-16
E
l
ijah Newren
merge-rec
u
rsive: be c
o
n
s
istent
w
ith
assert
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-16
El
i
j
ah Newren
chec
k
out: rem
o
ve duplica
t
e code
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-12
E
li
j
ah Newren
git-fast-impo
r
t
.
txt: c
l
arify that multiple merge
commits
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-06
Elijah Newren
merg
e
-
recursive: avo
i
d direct
o
ry rename det
e
ction in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-06-05
Elij
a
h Ne
w
ren
merge-recu
r
s
i
ve: restore accidentally dropped settin
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-05-14
Elija
h
Ne
w
ren
fast-expor
t
: do automatic reencodi
n
g o
f
com
m
it messages
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-05-14
Elijah Ne
w
ren
fast-export:
d
iffe
r
entiate between ex
p
licitly U
T
F
-
8
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-05-14
Elija
h
Newren
f
a
st-export:
avoi
d
stripping encodi
n
g he
a
der if we
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-05-14
Elijah Newren
f
ast-impo
r
t: support 'encoding' com
m
it hea
d
er
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-05-14
Elijah Newren
t9350:
fix enc
o
ding test to actual
l
y test ree
n
c
o
d
ing
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-26
Elij
a
h Ne
w
ren
Honor
c
ore
.
precomposeUnicode in more places
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
E
lija
h
Newren
m
e
rge-recursive: switch directory rename detecti
o
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Eli
j
ah Newren
merge
-
recursive: give callers of h
a
ndle_content_me
r
ge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah Newren
m
erge-
r
ecursive
:
track informat
i
on as
s
ociated wit
h
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah Newr
e
n
t6043: fix copied test des
c
rip
t
io
n
to match its purpose
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah Ne
w
ren
merge-recursive: swit
c
h from (oid,mode) pai
r
s to a
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah N
e
wren
mer
g
e-recursive:
clea
n
u
p
h
a
ndle_r
e
name_* f
u
nction sign
a
tures
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elija
h
Newren
merge
-
recursi
v
e
:
track branch where
renam
e
oc
c
urr
e
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah Newren
merge-recursiv
e
: remove r
e
n[12]_other fiel
d
s from rename_con
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah Newren
me
r
ge-re
c
urs
i
ve: shrink rename_conflic
t
_
info
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah Newren
merge-recur
s
ive: move some stru
c
t declarations together
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah Newren
merge-r
e
cursive: use 'ci' for
r
ename_conflict_inf
o
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
E
lijah Newren
merge-recursive: rename locals
'o' and 'a' to '
o
buf
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elij
a
h Newre
n
m
e
rg
e
-
recur
s
ive: rena
m
e di
f
f_filespec 'one'
to
'o'
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah Newren
merge-r
e
cursive: rename
m
erge_options argument
fr
o
m
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah
N
ewr
e
n
U
s
e 'unsigned
short'
for
mod
e
, like diff_filespec does
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-01
Elijah N
e
wren
fast-im
p
ort: fix
e
rr
o
neous ha
n
dling of get-mark w
i
th
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-01
Elij
a
h Newren
fas
t
-
i
mpor
t
:
on
l
y
a
llow cat-blob requests where it
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-01
Elijah New
r
en
fast-import: check mo
s
t promine
n
t
commands firs
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-01
E
lijah Newren
git-fas
t
-i
m
port
.
txt: fix
w
ordi
n
g
a
bout w
h
er
e
ls command
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-01
E
l
i
jah Newren
t93
0
0
:
demonst
r
ate bug
w
ith g
e
t-
m
ark and e
m
pty orpha
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-02-21
Elijah Newren
merge
-
options
.
t
xt: correct wordin
g
of --no-commit o
p
t
i
o
n
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-02-14
Elija
h
N
ewren
git-rebase
.
t
xt: update to reflect mer
g
e now i
m
plemen
t
ed
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-02-08
E
l
ijah New
r
e
n
log,diff-tree: add --comb
i
ne
d
-a
l
l-paths option
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-01-10
El
i
ja
h
Newren
git
-
show-
r
e
f
.
txt:
f
i
x order of flags
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-01-07
E
l
i
j
ah New
r
en
rebase:
i
mpleme
n
t --merg
e
via the interactive machine
r
y
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Elijah Newren
re
b
a
s
e: define linearization o
r
dering and enfor
c
e it
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Elijah Ne
w
ren
git-lega
c
y-re
b
a
s
e: sim
p
l
ify unnecessary tripl
y
-nested if
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Elijah N
e
wren
git-rebase, seq
u
ence
r
:
ex
t
end --quiet opt
i
on for the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Elijah
N
ewren
am, r
e
b
a
se--merge: do not over
l
o
o
k --s
k
ip'ed commits
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
El
i
jah Newren
t5407
:
add a
test demonstr
a
ting how interacti
v
e handles
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
E
l
ij
a
h Newren
rebase:
f
ix incompatible op
t
ions
err
o
r messag
e
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Elijah Newren
re
b
ase:
m
a
k
e bu
i
ltin and lega
c
y s
c
ri
p
t error messages
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-09
Eli
j
ah Newre
n
gi
t
-
r
e
base
.
txt: update note about dire
c
to
r
y r
e
name
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Eli
j
ah N
e
wren
fast-exp
o
rt
:
add a --show-origin
a
l-ids option to
s
how
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next