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
Merge branch 'tg/range-diff-output-update'
2019-10-08
Elijah Newren
mer
g
e
-recursive:
f
i
x t
h
e fix to t
h
e d
i
ff3 common
an
c
estor
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
Elij
a
h Ne
w
r
e
n
fa
s
t-export: handle
n
ested tags
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
E
l
ijah N
e
w
ren
t
9350: add tests for tags of things o
t
her than
a co
m
mit
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
Eli
j
a
h
Newren
fast-exp
o
rt:
a
llow user t
o
r
e
q
uest tags be marked with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
Elijah Newren
fast-expor
t
:
a
dd suppo
r
t for --
i
mport-marks
-
i
f-
e
xists
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
Elijah Newren
fast-i
m
port: ad
d
support for n
e
w 'alia
s
' command
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
Elija
h
New
r
e
n
fast-import: allo
w
tags to be identified by mark labels
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
Elijah Newren
fast-import: f
i
x
h
andling
of
delet
e
d tag
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-02
Elijah Newren
merg
e
-
r
ecursive: fix the diff3 common
an
c
estor
l
a
bel
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-02
Elijah N
e
wr
e
n
di
r
: sp
e
c
i
al case
check f
o
r the
p
o
s
sibilit
y
that p
a
thsp
e
c
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-28
E
li
j
ah Newren
f
as
t
-export: fix
exporting a tag
a
nd
n
othing else
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Eli
j
ah Newren
clean: fix theoreti
c
al
p
a
th corruption
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
El
i
jah
Newren
clean: rewrap overly long line
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah Newr
e
n
c
l
ean: avoid removing
u
ntra
c
k
ed file
s
in a nested git
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elija
h
Newren
clean: dis
a
m
b
ig
u
ate the
def
i
nit
i
on 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 not cl
a
im we wi
l
l delete files with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elija
h
Newren
dir:
add comment
a
ry explaining match_pat
h
spec_item
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah Ne
w
ren
d
i
r: if our pathspec m
i
ght ma
t
c
h
files
u
nder a di
r
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah
N
e
w
ren
dir:
ma
k
e the DO_
M
A
T
CH_SUBMODULE code reusabl
e
for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
E
l
ijah N
e
wren
dir: also check directories for matching p
a
thspecs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah Newren
d
ir: fi
x
off-by-one e
r
ro
r
in mat
c
h_pathspe
c
_item
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah Newren
dir: fix typo in comment
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
E
l
i
jah Ne
w
r
en
t7300: add test
c
ases
s
howing failur
e
to clean speci
f
i
e
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-05
E
lijah Newr
e
n
t9902: us
e
a n
o
n-deprecated command for
t
esting
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-05
Elijah Newren
Recommend git-
f
ilter-r
e
po
instea
d
of git
-
fil
t
er-branch
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-05
E
l
ijah Newren
t
6
006: simplify, fix,
a
n
d
o
p
timi
z
e
empty mes
s
age te
s
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-05
Elijah New
r
en
t3
4
27: accelerate
thi
s
t
e
st by using fast-export and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-01
Elijah Newren
m
e
r
ge-op
t
ions
.
txt: clarify
m
e
a
n
ing of various ff-related
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elij
a
h Newre
n
merge-recur
s
ive: al
p
h
a
bet
i
ze in
c
lu
d
e li
s
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
El
i
jah Newren
merge-
r
ec
u
rsiv
e
:
a
dd
s
anity
c
hecks for rele
v
a
n
t mer
g
e_opti
o
ns
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah
New
r
en
merge-r
e
cursive: rename
MERGE_RECUR
S
IVE_* to MERGE_VARIANT_*
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
merge-recur
s
ive: split intern
a
l
f
ields i
n
to a
s
e
parat
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
E
l
ij
a
h Newren
merg
e
-recursive: a
v
oid losing output and le
a
king mem
o
ry
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
El
i
j
ah Newren
merg
e
-recursive: comm
e
nt
a
nd reorder the mer
g
e_options
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
El
i
jah Newren
merge-recursive: consolidate u
n
necessary fi
e
lds in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah
New
r
en
merge-recur
s
ive: move some defini
t
ions aro
u
nd t
o
clean
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
El
i
j
ah
N
ewren
merge-re
c
ursiv
e
:
ren
a
me merge_op
t
ions argument to op
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah
Newren
m
erge-recursive: rename 'mrtree' to 'r
e
sult
_
tree',
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah
N
ewren
merge-rec
u
rsive: use
c
om
m
on name for
a
nces
t
ors/common
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
El
i
jah Newren
merge-recursive
:
fix som
e
overly long lines
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
El
i
jah
Newren
cache-tree:
s
har
e
c
ode between functions writing an
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
merge-recursi
v
e: don'
t
force external calle
r
s
to do
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
E
l
ija
h
Newren
merge-recursive:
r
e
m
ove useless parameter in merge_trees()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
E
l
i
jah Newren
merge-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
efor
e
invok
i
ng merge machinery
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
m
e
r
ge-recursive: remove another implicit d
e
pende
n
cy
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
El
i
jah
N
ewre
n
merge-recursi
v
e
:
future-pro
o
f update_f
i
le_fla
g
s() aga
i
n
st
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elija
h
Newre
n
merge-recursi
v
e: provide
a
b
e
tte
r
label for diff3 comm
o
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-16
Elijah Newren
m
e
r
ge-recursive: enf
o
rce opt
-
>ancest
o
r !
=
NULL when
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-16
Elij
a
h Newren
che
c
k
out:
provide
b
etter
c
on
f
lict hunk
desc
r
i
ption
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-16
Elija
h
N
ew
r
en
merge-re
c
ursive: be consistent with asse
r
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-16
Elija
h
New
r
en
checkout: remov
e
dup
l
icate co
d
e
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-12
E
l
ija
h
Newre
n
git-fast-impor
t
.
t
x
t
: clarify that multiple merge
commits
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-06
Elijah Newren
merge-recursi
v
e:
avo
i
d
d
irec
t
ory
r
ename
detect
i
on i
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-06-05
Elijah
N
ewren
merge-recur
s
ive:
r
estore accidentally dro
p
ped setting
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-05-14
Elijah
Newren
fast-export: d
o
a
u
t
o
matic r
e
enc
o
ding
o
f commit me
s
sages
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-05-14
E
l
i
j
ah New
r
en
fast-export: differ
e
ntiate
between explicitly UTF-8
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-05-14
Elijah Newren
fast-export: av
o
id stripping encoding h
e
ader if we
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-05-14
E
lij
a
h
N
e
w
ren
fast-import: support 'encoding' commi
t
header
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-05-14
Elijah Newren
t93
5
0
:
fix encod
i
ng test
to a
c
tually tes
t
reenco
d
ing
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-26
Elijah N
e
wr
e
n
Honor core
.
precomposeUnicode in more places
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
El
i
j
a
h Newren
m
e
rge-recursi
v
e
:
swi
t
ch
d
irectory rename dete
c
tion
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
E
l
ijah Ne
w
ren
mer
g
e-recursive: g
i
ve cal
l
e
r
s of ha
n
dle_content_merge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah
Newren
merge-r
e
curs
i
ve: track information associated with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
El
i
jah Newren
t6043: fix cop
i
ed
tes
t
description to match its p
u
rpose
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elij
a
h Newren
mer
g
e-
r
ecursi
v
e
:
sw
i
tch from
(oid,m
o
de) pai
r
s to a
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
El
i
ja
h
Newren
merge-recursive: cleanup handle
_
rename_* functi
o
n signatures
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elij
a
h Newren
merge-rec
u
rsiv
e
: t
r
ac
k
branch
w
here rename occurred
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elij
a
h N
e
wre
n
merge-
r
ecurs
i
ve: r
e
move ren[
1
2]
_
o
t
her
fields from rename_con
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Eli
j
ah N
e
wren
merge-r
e
cursive: shrin
k
rename_conflict_info
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elij
a
h
N
ewren
merg
e
-recursive: move
s
ome
s
t
r
uct declarations together
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah Ne
w
ren
merge-recursive: use 'c
i
'
f
or rename_c
o
nfl
i
c
t
_in
f
o
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah Ne
w
ren
me
r
ge-recurs
i
ve: r
e
name local
s
'o' and 'a' to 'obuf
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah Ne
w
ren
merge-recursive: rename
d
iff_file
s
pe
c
'o
n
e' to
'
o
'
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah
Newren
merge-
r
ecursive: rename
merge_options argumen
t
from
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah Ne
w
ren
U
s
e 'unsi
g
n
ed sh
o
rt' for m
o
de, like diff_filespec does
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-01
E
l
i
ja
h
Newren
fast-i
m
port:
fix erroneo
u
s handl
i
ng of get-mar
k
wi
t
h
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-01
Elija
h
Newren
fast-import: only al
l
ow cat-blob requests wh
e
re it
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-01
Eli
j
a
h
Newren
fast-im
p
ort: c
h
eck most prominent commands first
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-01
Elijah
Newre
n
git-fast-import
.
txt
:
f
ix
wording about where ls command
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-01
Elij
a
h
Newren
t
9
300:
d
e
m
onstrat
e
bu
g
with get-mark and empty
o
rpha
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-02-21
Elijah
N
ewren
merge-options
.
t
xt: corr
e
ct wording of --no
-
commit option
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-02-14
Eli
j
ah Ne
w
ren
g
it-rebase
.
txt:
u
pdate
to
reflect me
r
ge
n
ow implem
e
nted
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-02-08
Elija
h
Ne
w
ren
log,dif
f
-tr
e
e: add --combined-all-paths option
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-01-10
Elijah New
r
en
git-sh
o
w-ref
.
txt: fix order of
f
lags
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-01-07
Elij
a
h Newren
rebase: implem
e
nt --merge vi
a
the
i
nteractive machinery
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Elijah Newren
rebase: def
i
ne linearization
o
rdering
a
nd en
f
orce
it
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Elij
a
h Newr
e
n
git-leg
a
cy-rebase: simplify u
n
n
ecessa
r
y triply-nested if
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
E
l
ija
h
Newren
git-rebase, sequencer:
exten
d
--quiet
opt
i
o
n
for
the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Elijah Newren
am, re
b
ase--merge: do n
o
t overlook --skip'ed comm
i
t
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Eli
j
ah Newren
t5407: ad
d
a test demonstrating
h
ow interactive
h
andles
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Eli
j
ah Newren
rebase:
f
ix incompatible opt
i
ons err
o
r message
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Elijah Newren
rebase: make built
i
n and legacy scr
i
pt error mes
s
ag
e
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-09
Elija
h
N
ewren
git-re
b
as
e
.
txt: update note about dire
c
t
ory rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah New
r
e
n
fast-export: add a --s
h
o
w
-original-ids
o
ption to show
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Eli
j
ah
Newren
fast-import: rem
o
ve u
n
maintained
duplica
t
e do
c
umentation
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah Newren
fa
s
t-exp
o
rt: add --re
f
erence-exclud
e
d-parents option
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah Newren
fast-export:
e
nsur
e
we e
x
port
r
equested
r
ef
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
El
i
j
a
h Newren
fas
t
-expor
t
:
w
hen using paths, avoid c
o
rru
p
t stream
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah Newren
fast-expor
t
:
m
o
ve commit rewriting lo
g
ic into a function
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next