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
Third batch after 2.20
2019-01-10
El
i
ja
h
Newren
git-show-
r
e
f
.
txt
:
fix ord
e
r of flags
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-09
Elijah Newre
n
git-rebase
.
txt: up
d
a
te n
o
te about direct
o
ry rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Eli
j
a
h Newren
fast
-
e
xpo
r
t:
add a -
-
sho
w
-
orig
i
n
a
l-i
d
s opti
o
n
t
o show
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah
N
ewren
fast-i
m
por
t
: re
m
ove unmaintai
n
ed duplicate documentation
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elij
a
h New
r
en
fast-e
x
port:
a
dd --referenc
e
-e
x
cluded-parents optio
n
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
E
l
i
j
a
h
Newr
e
n
fast-e
x
port:
e
nsure w
e
e
x
port reque
s
te
d
refs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elija
h
N
ewren
fast-export:
when usin
g
paths
,
avo
i
d
corrupt stream
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Eli
j
ah Newren
f
a
st-ex
p
ort:
m
ov
e
commit r
e
w
r
iting logic
i
nto
a functi
o
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
El
i
jah Newren
fast
-
ex
p
o
rt:
avoi
d
dying w
h
en filtering by paths
a
nd
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elija
h
Newren
fast-export: us
e
value from correct enum
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Eli
j
ah Ne
w
ren
git-fa
s
t-exp
o
rt
.
txt: cla
r
ify misleading
documentation
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah Newren
git-
f
ast-i
m
p
ort
.
txt: fix documentation
f
or --quiet
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
E
lijah Ne
w
ren
fast-e
x
port: convert sha1 to
oid
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
E
lij
a
h Newren
t6036, t6043:
i
ncrease cod
e
c
o
verage for f
i
le coll
i
sion
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
E
l
ijah Newr
e
n
m
er
g
e-recu
r
sive:
i
mprove ren
a
m
e/rename(
1
t
o
2)/
a
dd[/add
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
E
l
ija
h
Newren
mer
g
e-recurs
i
ve:
use handle_file_collis
i
on fo
r
a
d
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elijah
N
e
wren
merge-rec
u
rsive: i
m
prove handling
for ren
a
me
/
rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
E
lijah New
r
e
n
merge-recurs
i
v
e
:
f
i
x renam
e
/add conflict hand
l
ing
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
El
i
jah Newren
merge
-
recursive:
new function for be
t
ter colli
d
ing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elij
a
h Newren
merge-recursive:
increase mar
k
er length with depth
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elijah Newren
t6036, t6042: te
s
tcases for rename
collisi
o
n of already
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elijah Newren
t6042: ad
d
tests
for consi
s
te
n
cy in file c
o
ll
i
sion
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-10-22
E
lijah Newren
fsck
:
move fsck_he
a
d_
l
in
k
(
)
to ge
t
_defau
l
t
_heads()
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-10-18
Elij
a
h Newren
merge-recur
s
ive
:
avoid
showi
n
g conflict
s
with merge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-10-18
Elijah N
e
wren
merge-recursive: improve auto-merg
i
ng messages with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-27
E
lijah
N
e
w
ren
co
m
mit: fix erroneous BUG, 'mult
i
ple rename
s
on the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-20
E
li
j
ah Newren
merge-
r
ecursi
v
e: rename merge_file_1() and
m
erge_co
n
tent()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-20
E
lijah Newren
merge-recur
s
i
ve: rem
o
ve final re
m
aining caller of
m
e
rge_file
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-20
E
lijah Ne
w
ren
merge-recursive:
a
void wra
p
p
e
r function w
h
en unnecessary
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-20
E
l
ija
h
Newren
m
erg
e
-
recur
s
ive: set
paths correctly
when three
-
wa
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-13
E
l
ijah Newren
s
equencer:
fix
-
-allow-empty-message be
h
avior, make
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-12
Elijah
N
e
wren
update-ref: all
o
w --no-deref with --stdin
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-12
Elijah
Ne
w
r
e
n
update
-
re
f
: fix type of update_flags varia
b
le to match
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-11
Elijah Newren
r
erere: avoid buffer overrun
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-11
Elijah Newren
t4200: d
e
monstr
a
te
rere
r
e segfault
on spec
i
a
ll
y
c
r
aft
e
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-05
Elijah N
e
wren
Remove sup
e
rfluous trailing sem
i
colons
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-30
Elijah Newren
am: avoid director
y
rename de
t
ectio
n
w
h
en calling
r
e
cursive
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-30
E
lijah Newre
n
merge-r
e
cursive:
a
dd ability t
o
turn
o
ff directory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-30
Elija
h
Newren
t340
1
:
ad
d
another d
i
rector
y
rename testcase fo
r
rebase
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elijah
N
e
wren
Rem
o
ve forward declar
a
ti
o
n of a
n
enum
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elijah Newr
e
n
c
o
mpat/p
r
ecompo
s
e_utf8
.
h: use
m
ore common in
c
lude guard
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elija
h
Newren
urlmatch
.
h: fix include guard
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elij
a
h
New
r
en
Mo
v
e d
e
finition
o
f enum branch_t
r
ack
f
r
o
m cache
.
h
t
o
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elijah Newren
alloc
:
ma
k
e
all
o
cate_alloc
_
s
tate
a
nd clea
r
_alloc_state
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elijah Newren
A
d
d mi
s
si
n
g includes
a
n
d
for
w
ard declarations
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elijah Newren
g
i
t-upda
t
e-index
.
txt
:
re
w
or
d
possib
l
y confusing example
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elijah
Ne
w
ren
t
7
406:
avoid using te
s
t_must_f
a
il fo
r
c
o
mmands other
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elijah
N
ewren
t7
4
06: pr
e
fer te
s
t_* helper
f
uncti
o
ns to
te
s
t
-[feds]
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elija
h
N
e
wren
t7406: avo
i
d havi
n
g gi
t
commands
u
pstrea
m
o
f
a p
i
pe
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elija
h
Newren
t
7
406:
simplify by using diff
--name-o
n
ly inst
e
a
d
of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elijah
N
ewren
t7406:
fix
c
all that w
a
s failing
for the wrong reason
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-06
E
l
ijah Newren
t
3
03
1
: update test de
s
cript
i
on to mention des
i
red b
e
havior
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-31
Elijah New
r
en
r
e
ad-cac
h
e: fix directory/file conflict han
d
l
ing
i
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-31
Elijah N
e
wren
t1015:
d
em
o
nstrate di
r
ectory/file
conflict
r
ec
o
very
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-27
El
i
jah Newren
merge-recu
r
si
v
e: pr
e
s
e
rve skip_wor
k
tree bi
t
when nece
s
sary
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elija
h
N
e
wren
t7405
:
ve
r
if
y
'merge --abort' works after su
b
module
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Eli
j
ah
N
e
w
r
e
n
t7405: add a directory/subm
o
dule confl
i
ct
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
E
lijah
New
r
en
t7405: add a file/submodule conflict
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elij
a
h
Newren
me
r
g
e
: fix misleading pre-merge che
c
k d
o
cumenta
t
ion
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah
Newren
merge-recursiv
e
: en
f
orce rule
t
hat index matches head
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newren
t60
4
4: a
d
d more
testcase
s
w
i
th staged
c
hange
s
before
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah
Newren
merge-recursive: fix assu
m
pt
i
on
that he
a
d t
r
ee being
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newren
m
e
rge
-
recursive: make sure when we say
w
e abo
r
t th
a
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newren
t6
0
4
4
:
ad
d
a te
s
tcase for
i
ndex matching h
e
ad, wh
e
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah
N
e
w
r
e
n
t60
3
6
: add a failed
conflict detection
case: re
g
ular
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-06
Elijah Newren
t6036: add
lots of
d
etail for
d
i
rectory/file c
o
nfl
i
c
ts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
E
l
i
jah Newren
t6042:
add t
e
stcase
covering long chains of rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
E
lijah Newren
t6042
:
add testcase
c
overing
rename/r
e
name(2t
o
1
)
/
d
elete
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Ne
w
r
en
t6042: add tes
t
case covering rename/
a
dd/delete con
f
lict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Ne
w
r
en
t6036: add
a failed conf
l
i
c
t detection
c
a
s
e with
c
onfl
i
ctin
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newren
t6
0
36: add a
f
ailed conflict detec
t
i
o
n c
a
se w
i
th submodule
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newren
t603
6
: ad
d
a
failed co
n
f
l
i
c
t
d
etec
t
ion case with subm
o
du
l
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
E
l
ijah Ne
w
r
en
t6036: add a fail
e
d conflict dete
c
tion case
w
i
th symlink
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elij
a
h New
r
en
t6036:
ad
d
a fa
i
l
e
d
c
o
n
f
l
ic
t
detec
t
ion case with symlin
k
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newr
e
n
t6044: ver
i
fy tha
t
merges expected to a
b
ort actually
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Ne
w
ren
index_has_chan
g
es(
)
: avoid assuming oper
a
ting on the_in
d
ex
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newren
read-cach
e
.
c: mo
v
e i
n
dex_has
_
changes() from merge
.
c
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-28
Elijah Newre
n
t
5
4
0
7: fix
t
est to cover in
t
ended a
r
guments
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-28
Elijah Newren
apply: fix grammar error
i
n co
m
ment
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Eli
j
a
h Newren
gi
t
-rebase--merge: modernize "gi
t
-$cmd" to "gi
t
$cmd"
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Newren
Fix use of strategy options w
i
th interactive reba
s
es
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Ne
w
ren
t3418: add testcase showing problems with r
e
ba
s
e
-i
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah N
e
wren
git
-
rebase: make
-
-allow-emp
t
y-message the de
f
ault
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Ne
w
ren
t
3
401: add directory r
e
name testcases for rebase and am
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
E
lijah
N
ewren
git-r
e
b
a
se
.
txt: document behavio
r
al differences b
e
tween
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elij
a
h Ne
w
r
e
n
director
y
-ren
a
m
e-de
t
ect
i
o
n
.
t
x
t
:
technical docs on abilit
i
e
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
El
i
jah
Newren
git-rebase
.
txt: addres
s
co
n
fusion b
e
t
ween --no-ff vs
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
E
lij
a
h
New
r
en
git-rebas
e
: err
o
r ou
t
whe
n
inco
m
p
atible
o
p
tions
p
a
ssed
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Eli
j
ah Newren
t3422: new testcases for checkin
g
when incompa
t
i
ble
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-26
Elija
h
Newren
git-rebase
.
sh: update help messag
e
s a
bit
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-26
Elijah N
e
wren
git-rebase
.
txt: documen
t
i
n
compa
t
ible options
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-13
Elijah Newren
R
elNotes 2
.
1
8:
c
larify where directory rename detection
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
Elija
h
Newren
m
e
rge-recursive: add p
o
inter about unduly complex lo
o
king
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
Elij
a
h Newre
n
merge
-
re
c
u
r
sive:
r
ename conflic
t
_ren
a
me_*
(
) family
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
E
l
i
j
ah Newren
merge-recursive: clarify the
rename_dir/RENAME_
D
IR
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
Elijah New
r
en
merge-recur
s
ive: a
l
ig
n
labe
l
s w
i
t
h
their respective
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
Elijah Newren
m
e
r
ge
-
recursive: fix numerous argument alignment issues
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
E
l
ijah
Newren
merge
-
recursive: fi
x
misc
e
llaneous g
r
ammar error
in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-01
Elijah
N
ewr
e
n
Rel
N
otes:
r
e
move
dup
l
i
cate release note
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Elijah N
e
wren
t6036: pr
e
f
e
r
tes
t
_when_finished
to man
u
a
l cleanup
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next