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
fast-export: do automatic reencoding of commit messages only if requested
2019-05-14
Elijah Ne
w
ren
fast-
e
xpor
t
: do automatic reencoding o
f
c
o
mmit message
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-05-14
Elijah Newren
fast-expor
t
:
d
ifferentiate be
t
ween explic
i
tly UT
F
-
8
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-05-14
Elijah Newre
n
fast-e
x
port
:
avo
i
d stripping
encoding header if we
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-05-14
Elijah New
r
en
fast-im
p
o
r
t: support
'
encoding' co
m
mit header
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-05-14
Elijah
N
ewren
t9350
:
fi
x
encoding
t
est to ac
t
u
ally test reenco
d
ing
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-01
E
lij
a
h
N
e
w
ren
f
a
st-import: fix
e
rroneous han
d
ling of
g
et-mark with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-01
Elijah
N
ewren
fa
s
t
-import: onl
y
al
l
ow cat-bl
o
b requests where it
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-01
E
l
ijah New
r
e
n
fast-impo
r
t:
check
most pr
o
minent command
s
first
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-01
E
l
ijah Ne
w
ren
g
it-fast-import
.
tx
t
: fix wordi
n
g about where ls co
m
m
and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-01
Elijah N
e
wren
t9300: de
m
onstrate bug with get-mark and empty orphan
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-02-21
Elijah Newr
e
n
merge-opti
o
ns
.
txt: correct wordin
g
of --n
o
-comm
i
t
option
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-02-14
Elijah
Newren
git-rebase
.
t
x
t: update to re
f
le
c
t merge now im
p
lemented
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-02-08
E
l
i
j
a
h Newr
e
n
log,di
f
f-tree:
add --c
o
mbined-all-paths
o
p
t
ion
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-01-10
E
lijah Newren
g
it
-
show
-
ref
.
txt: fix o
r
der of flags
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-01-07
Elijah Newren
r
eb
a
se: imp
l
ement
--
m
e
rge vi
a
t
he
i
nteractive
mach
i
ner
y
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Elijah
Newren
re
b
ase: define linearizat
i
o
n
ordering and enfo
r
ce it
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Elijah Newren
g
i
t-
l
e
g
acy-rebase: simplif
y
unnec
e
ssary
t
riply-nested if
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
E
lija
h
Newren
git-rebase
,
se
q
u
encer: extend --quiet
o
ption for the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Elijah
N
ewren
am,
r
e
b
ase--mer
g
e:
do no
t
ove
r
l
ook --s
k
ip'ed commi
t
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Elijah
N
ew
r
en
t5407: add a test demonstratin
g
how
interactiv
e
h
andles
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Elijah Newren
rebas
e
: fix incompa
t
ible opt
i
on
s
error message
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
E
lijah N
e
w
r
e
n
rebase: make builtin and legacy s
c
ript erro
r
m
e
ssag
e
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-09
Elijah Newren
g
i
t-rebase
.
t
x
t: updat
e
note about directory re
n
ame
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
E
lija
h
Newren
fast-
e
xport: a
d
d a -
-
show-origina
l
-i
d
s option to show
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
E
li
j
ah
N
ew
r
en
fa
s
t
-
import:
r
e
m
o
ve unmaintained duplic
a
te documen
t
ation
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah Newren
fast
-
e
x
port: add --reference-exc
l
u
d
e
d-parents
option
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Eli
j
ah
Newren
fast-export: ensure
w
e export r
e
quested ref
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
E
lijah Newren
fast-export: when
u
sin
g
paths,
a
voi
d
corrupt stream
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
E
l
i
jah N
e
w
r
en
fa
s
t-export: move commi
t
rewriting log
i
c int
o
a funct
i
on
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah Newren
fa
s
t
-
e
xport: avoid
d
y
ing when filtering
b
y paths an
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
E
l
i
jah New
r
e
n
fast-expo
r
t: us
e
value
f
r
om
c
orrect enu
m
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah
N
e
wren
g
it-fast-export
.
txt: cl
a
r
i
fy
misleading d
o
cumentation
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
E
l
ijah Newren
g
it-f
a
st-import
.
t
x
t: fix
d
ocumentation for --quiet
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
El
i
jah Newren
fast-export: conv
e
r
t
s
h
a1
to o
i
d
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
El
i
j
a
h
Newr
e
n
t
6036
,
t6043: increa
s
e code covera
g
e for file col
l
ision
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elijah Newren
merge-recu
r
sive: improv
e
ren
a
m
e
/rename(1to
2
)/add[/add
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elijah Newren
merg
e
-recurs
i
v
e: use hand
l
e_file_colli
s
i
o
n
fo
r
ad
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Eli
j
a
h Newren
merge-rec
u
rsive: improve
han
d
ling for rename/ren
a
m
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elijah Newren
m
erge-recur
s
ive
:
f
ix r
e
name/add conflict handling
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
E
l
ijah Newren
merge-recursive
:
n
ew function for better colliding
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elijah
N
e
wren
merge-recu
r
sive: increase mar
k
e
r
l
ength with depth
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elijah
N
ewren
t6036
,
t6042
:
te
s
tcases
for
r
ename collision of al
r
eady
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
E
li
j
ah Newren
t604
2
: add tests for
c
ons
i
stency in file c
o
l
l
ision
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-10-22
Elijah Newren
fsc
k
:
m
o
v
e fsck_hea
d
_lin
k
() to g
e
t_default_
h
eads()
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-10-18
El
i
jah Newren
merge-recursive
:
avoid
showing con
f
l
icts with merg
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-10-18
Elijah Newren
merge-rec
u
rsive: imp
r
ove
a
uto-me
r
ging messages with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-27
Elijah Newren
commit
:
fix erroneous BUG, 'multiple renames on the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-20
E
l
ijah Newren
me
r
ge-
r
ecursive: rename merge_f
i
l
e_1()
and
merge_
c
ontent()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-20
E
lij
a
h Newren
mer
g
e-r
e
cur
s
i
v
e: remove f
i
nal remaining
c
a
l
l
e
r
of merge_
f
ile
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-20
Elija
h
Ne
w
ren
mer
g
e-recursive: avoi
d
w
rapp
e
r
f
unc
t
ion w
h
en unneces
s
a
ry
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-20
El
i
jah Newren
me
r
g
e
-recursive:
set
p
aths c
o
rre
c
tly when three-wa
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-13
Elijah
Newre
n
se
q
u
e
nce
r
: fix --allow
-
e
m
pty-message behavior, make
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-12
Elijah Newren
update-ref:
a
llow --no-deref with --s
t
din
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-12
Elija
h
New
r
en
update-ref:
fix type of update_flags vari
a
ble to match
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-11
Elijah Newren
rerer
e
:
avo
i
d
b
uffer o
v
errun
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-11
Eli
j
ah Newren
t420
0
: dem
o
nstrate rerere segfault on spec
i
ally cr
a
f
te
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-05
Elijah Newren
Remove s
u
perfluous trailing semi
c
o
l
ons
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-30
Elijah Newren
am: avo
i
d d
i
r
e
ctory rena
m
e detection when calling recu
r
sive
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-30
E
l
ijah Newren
merge
-
recursive: add abili
t
y to turn off directory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-30
E
l
ijah Newren
t3401:
a
dd another directory rename testcase for
rebase
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elijah
Newren
Remove
f
orwar
d
declarat
i
o
n of an
e
num
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Eli
j
ah Newren
com
p
at
/
precompose_
u
tf8
.
h: us
e
mor
e
common include guard
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elijah
Newren
urlmatch
.
h: fix include g
u
ard
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elijah N
e
wren
Move
definition
of
e
num branch_track from
cache
.
h to
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elijah
Newren
alloc: m
a
ke allo
c
ate_alloc_state and clear_
a
lloc_state
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Eli
j
ah
N
e
wren
Add mis
s
ing
i
nclude
s
and forward d
e
cl
a
rations
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elijah
N
ewr
e
n
git-upda
t
e-index
.
txt
:
reword pos
s
ibly
c
o
nfusing
e
x
ample
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Eli
j
ah Newr
e
n
t
7406: avo
i
d using
t
e
st_mu
s
t_fail for commands
other
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
E
l
i
jah Newren
t740
6
:
p
refer test_* helper f
u
nctions
t
o test -[feds]
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elijah Newren
t7406: avoid h
a
v
ing git comm
a
nds
u
pst
r
eam of a pipe
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
E
l
ijah N
e
wren
t7406
:
s
i
m
p
lify by
u
sing diff --name-only in
s
tead of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elijah Newren
t7406: fix ca
l
l
t
ha
t
wa
s
f
a
i
lin
g
for the wrong
r
e
a
son
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-06
E
l
ij
a
h Newren
t3031: upda
t
e test
d
escription to m
e
ntion desired beha
v
i
or
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-31
E
lijah Ne
w
ren
read-cache: fix di
r
ector
y
/file
con
f
lict h
a
n
dli
n
g in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-31
Elijah Newren
t101
5
:
d
e
monstrat
e
directory/file conflict recove
r
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-27
E
l
ijah Newre
n
m
e
r
g
e
-recursive: prese
r
v
e s
k
ip_worktree bit
w
hen necessary
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah New
r
e
n
t740
5
:
ve
r
ify '
m
erge --abort' wo
r
ks after
s
u
b
modu
l
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Eli
j
a
h
Newren
t7405:
a
dd a directory
/
submodule conflict
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah
New
r
en
t7405: add a f
i
le/sub
m
odule conflict
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newre
n
merg
e
:
fix mi
s
l
ea
d
ing pre-merge ch
e
ck documentation
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah N
e
w
ren
merge-recurs
i
v
e
: enforce rule tha
t
ind
e
x matches head
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
E
lijah Newren
t
6044: a
d
d more
testcases
with staged
change
s
bef
o
re
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
E
l
i
jah Newre
n
merge-r
e
c
ursive:
fix assumption t
h
at head tree being
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newren
m
e
rg
e
-recursi
v
e: make sure when w
e
say w
e
abo
r
t that
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
El
i
j
a
h Newren
t6044: add a testcase for index matching head, when
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newren
t6
0
36: add
a
f
a
iled conflict detecti
o
n case: regular
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-06
Elijah Newre
n
t6
0
36: ad
d
lots o
f
detail for direc
t
o
ry/file c
o
nflicts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah
N
ew
r
en
t
6
0
42:
add
t
estca
s
e covering long chains
o
f rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newren
t6042: add tes
t
c
ase covering renam
e
/re
n
ame(2t
o
1)
/
de
l
e
t
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
El
i
ja
h
Newren
t6042
:
add testcase coverin
g
rename/add
/
delete conflict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elija
h
Newren
t
6
03
6
: add
a
failed con
f
l
i
ct
dete
c
tion case with co
n
f
l
ict
i
ng
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah
N
ewren
t6
0
36: add a failed conf
l
i
c
t detectio
n
c
a
se with submo
d
ule
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah N
e
wr
e
n
t603
6
: add a failed conf
l
ic
t
detecti
o
n case with submodule
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newren
t60
3
6
:
ad
d
a failed
c
onfl
i
ct dete
c
tion
case with symlink
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newren
t6036: add a faile
d
c
on
f
lict detectio
n
case wi
t
h syml
i
nk
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
E
li
j
ah Newren
t6044: v
e
rify that merges expect
e
d to abor
t
actually
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newren
ind
e
x
_
has_changes(
)
:
avoid as
s
u
ming operating on the_index
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elija
h
Newren
read
-
cache
.
c: mo
v
e index_has_changes() from merg
e
.
c
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-28
Eli
j
a
h
N
e
wren
t5407: fix test to cov
e
r in
t
ended arguments
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-28
Elijah Newren
a
ppl
y
: f
i
x g
r
ammar error in comment
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next