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 'cy/zsh-completion-SP-in-path'
2018-12-09
E
l
ijah Newren
git-rebas
e
.
t
xt: update note about directory rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah Newre
n
fas
t
-
export: add a --show-orig
i
nal-ids
option to show
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah Newren
fast-im
p
ort: rem
o
ve
unmaintained d
u
p
l
icate documentation
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah Newren
f
a
st-expo
r
t: add --refe
r
ence-excluded-pare
n
ts option
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elij
a
h Newren
fast-export: ensure we export
r
eques
t
e
d
refs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah Ne
w
r
en
f
ast-exp
o
rt:
w
hen using paths, a
v
oid cor
r
u
p
t st
r
eam
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
E
lijah Newren
fast-expor
t
:
move commit rewrit
i
ng
l
ogic into a
f
unct
i
on
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah Newren
fast-export: avoid dying wh
e
n filt
e
ring by paths and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah New
r
en
fast-ex
p
ort: use
v
a
lue from c
o
rrect enu
m
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elija
h
Newre
n
git-
f
ast-export
.
t
x
t: clarify
m
isleading
doc
u
mentatio
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah Newren
git
-
fast-import
.
txt: fix docum
e
ntat
i
on for --quiet
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah Newren
fas
t
-expor
t
: convert sha1
t
o oid
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
E
l
ijah Newren
t6036, t
6
043: increase c
o
de coverage for
f
ile collision
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elij
a
h
N
e
wren
m
e
rge-recursive: i
m
prove rename/rename(1t
o
2)/add[/
a
dd
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
El
i
j
a
h Newren
merge-recursive
:
use handle_file_collision
f
or
a
dd
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elijah Newren
merge-
r
ecu
r
s
i
ve: improve handling
f
or rename/rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
E
l
ijah Newren
merge-recursive: fix
rename/add conflict han
d
lin
g
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elijah New
r
e
n
merge-recursive:
n
e
w funct
i
on for better c
o
l
liding
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elij
a
h
Newren
mer
g
e-rec
u
rsive: increas
e
marker
length with
d
epth
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elijah Newren
t6036, t6042: testcases f
o
r rename collision
of already
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
El
i
jah Newren
t6042: ad
d
t
e
sts for consiste
n
c
y
in file collisio
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-10-22
Elijah Newren
f
sc
k
: move fsck_head
_
lin
k
() to g
e
t_defaul
t
_he
a
d
s
()
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-10-18
Elijah Newr
e
n
merge
-
r
ecursive: avoid show
i
n
g
conf
l
ic
t
s
with merge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-10-18
Elijah Newren
merge-recursive: i
m
pr
o
ve aut
o
-merging
messages with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-27
Elij
a
h New
r
en
commit: fix err
o
neous BUG
,
'multiple renames on the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-20
Eli
j
ah N
e
w
ren
me
r
ge-recursive: r
e
name
m
erge_fil
e
_
1
(
)
and merg
e
_content()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-20
Elijah Newre
n
merge-rec
u
rsiv
e
: remove 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
l
i
j
ah N
e
wren
merge-recursiv
e
: avoid w
r
apper
f
unction w
h
e
n unnece
s
s
a
ry
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-20
E
l
i
jah Newren
me
r
ge-r
e
cur
s
i
ve:
set paths correctly w
h
en t
h
ree-way
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-13
Eli
j
ah Newren
sequencer: fix --allo
w
-empty-message
b
e
ha
v
ior
,
make
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-12
E
l
ijah Newren
update-ref: allo
w
--no
-
d
ere
f
with --stdin
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-12
Eli
j
ah Newren
upd
a
te-ref: fix type
o
f update_flags
variabl
e
to matc
h
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-11
Elijah
N
e
w
r
en
rerere: avo
i
d b
u
ffe
r
o
v
e
rrun
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-11
Elijah
N
ewren
t
42
0
0: demo
n
strate rerer
e
se
g
fa
u
l
t on sp
e
cially cr
a
fted
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-05
E
lija
h
N
e
wren
Remove sup
e
r
f
luous trail
i
ng semicolo
n
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-30
E
l
i
j
ah N
e
wren
am: avo
i
d di
r
ectory rename detection when calling recursive
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-30
Elij
a
h Newren
merge-
r
ecu
r
si
v
e: add
ability to t
u
rn off directory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-30
Elijah
N
ewren
t3
4
01: add another
directory
rename tes
t
case for rebase
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Eli
j
ah N
e
wren
Remo
v
e forward de
c
laratio
n
of an
enu
m
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
E
l
ijah Newren
c
o
mpat/p
r
e
c
o
mpose_u
t
f8
.
h: u
s
e more
com
m
on include guard
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elij
a
h Newren
u
r
lmatch
.
h: fi
x
include guard
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elijah Newr
e
n
Move definition of en
u
m branch_track from
c
a
che
.
h to
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elijah N
e
w
re
n
alloc: m
a
ke all
o
c
a
te_all
o
c_state and clear_alloc_s
t
ate
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elijah Newren
Add missing includes and
forw
a
rd declarations
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
E
l
ijah Newren
git-u
p
d
a
t
e
-index
.
txt: rewo
r
d possibl
y
conf
u
sing e
x
ample
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elija
h
N
ewren
t74
0
6: a
v
oid using t
e
st_must_
f
ail for commands other
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elijah Newren
t7
4
06:
p
r
efer test_* helper function
s
to test -[feds]
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elijah Newren
t7406: av
o
id having git commands up
s
trea
m
o
f a
p
ipe
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elijah Newren
t7406:
s
implify
by
u
sing di
f
f --n
a
me-onl
y
i
ns
t
e
ad of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elijah Newren
t7406: fi
x
call that was failing
for the wrong reason
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-06
Elijah Newren
t3031: up
d
ate test description
to m
e
ntio
n
d
e
sired
b
ehavior
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-31
Elijah Newren
r
e
ad-cache: fix directory/file
c
onflict handl
i
ng
i
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-31
Elijah Newren
t1015: d
e
mons
t
rate directory/file conf
l
ict
recover
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-27
Elijah New
r
en
merge-recursive:
p
r
e
serve skip_
w
orktree bit when necessary
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newren
t7405: ver
i
fy 'merge -
-
abort' wor
k
s after submodu
l
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newren
t7405: add a directory/submodule
c
onflict
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
El
i
jah
Newren
t7405: add a
f
i
le/
s
u
b
module conf
l
i
c
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newren
m
erge: f
i
x misleadi
n
g pre-
m
erge check document
a
tion
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
El
i
jah Newre
n
merg
e
-recu
r
si
v
e
: enforce
r
u
le th
a
t
i
ndex matches head
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newren
t6044: add
more test
c
ases with staged change
s
befor
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah
Newren
merge-recursive: fix assumption
t
hat head tree being
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah New
r
en
m
e
rge-recursiv
e
: make sure when we say we abort that
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
El
i
j
a
h
N
ewren
t
6
044: a
d
d a testca
s
e
for index
matchin
g
head,
when
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
E
l
ijah Newre
n
t
6
036: ad
d
a
f
ailed conflict detection case: regular
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-06
Elijah N
e
wren
t6036: a
d
d lots of detail for directory/file conf
l
icts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
E
l
ijah Newren
t
6
042
:
add t
e
stcase co
v
e
r
ing
l
o
n
g c
h
ains of rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newren
t6042: add
t
e
stcase covering re
n
ame/rename(
2
to
1
)/dele
t
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elija
h
Newren
t604
2
: add te
s
tca
s
e cov
e
r
ing rename/add/delete
c
onflict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newr
e
n
t
603
6
: add a fai
l
ed conflict detec
t
i
on
case with conf
l
i
ctin
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newren
t6036
:
add a failed
c
onfli
c
t detec
t
ion case with submodule
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elija
h
Newren
t6036: add
a
f
a
i
l
ed conflict de
t
ection case wit
h
submodule
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newren
t6036: add a fai
l
ed
conflict detec
t
ion case with s
y
m
link
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newren
t6036
:
add
a faile
d
conflict detectio
n
case with symli
n
k
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elij
a
h Ne
w
r
e
n
t6
0
44: v
e
rif
y
tha
t
merges ex
p
ected to abo
r
t actually
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah
N
ewren
in
d
ex_has_
c
hang
e
s(): avo
i
d assuming ope
r
ating o
n
the_index
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah
N
ewren
r
e
ad-cache
.
c:
m
o
v
e
index_has_changes()
f
rom merge
.
c
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-28
Elijah Newren
t5
4
0
7
:
fi
x
test to cover
inte
n
ded arguments
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-28
E
l
ijah Newren
apply: fix gra
m
mar err
o
r in comment
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Eli
j
ah Newren
git-rebase--merge:
mode
r
n
ize "git-$cmd" to "git $cmd
"
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
E
l
ijah Newren
Fix use of
strategy option
s
w
ith interactive rebases
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah New
r
en
t
3418: ad
d
testcase s
h
owing problems with reb
a
se -i
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Newren
git-re
b
ase: mak
e
--all
o
w-empty-messag
e
the default
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
E
l
i
j
ah Newren
t
3
401:
add directory r
e
n
ame testcase
s
for reb
a
se and am
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
E
lija
h
Newre
n
git-rebas
e
.
txt
:
doc
u
ment beha
v
ior
a
l differences between
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Newr
e
n
directo
r
y-
r
e
n
ame
-
de
t
ectio
n
.
t
xt: technical docs on
a
b
i
lities
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah
Newren
git-rebas
e
.
txt:
a
ddress c
o
nf
u
sion between --no-ff vs
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elija
h
Newren
git-rebase: e
r
ro
r
o
ut w
h
en incompatible opti
o
ns
p
assed
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
El
i
jah
N
ewren
t3422: new
t
est
c
ases
for
c
hec
k
in
g
when in
c
ompa
t
ible
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-26
El
i
j
a
h Newren
git-
r
ebase
.
sh
:
update help messages a bit
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-26
Eli
j
ah Ne
w
ren
git-rebase
.
txt: docu
m
ent
incompatible options
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-13
Elijah Newre
n
Rel
N
otes 2
.
18: clarify where direct
o
ry rename dete
c
t
i
on
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
Elij
a
h N
e
wren
merge-recursive: add pointer ab
o
ut unduly
c
omplex lookin
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
Elijah Newren
merge-recursive: rename
conflict_rename_*() fa
m
ily
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
Elijah
N
ewren
merg
e
-rec
u
rs
i
ve: clarify the
rename_dir
/
R
E
NAME
_
D
I
R
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
Elijah N
e
wren
merg
e
-
r
ecur
s
ive: align
l
abe
l
s wi
t
h their
respective
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
Elij
a
h
Newren
merge-re
c
ursive
:
fix nume
r
ous
a
rg
u
ment a
l
ig
n
m
e
n
t
issues
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
Elijah Newren
merge-recursive
:
fix miscellaneous grammar error in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-01
Elijah Newren
R
elN
o
tes: remove
d
u
plic
a
t
e
r
e
lease
note
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
E
lijah
Newren
t6036
:
pre
f
e
r test_whe
n
_f
i
nished
t
o man
u
al cleanup
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Elija
h
N
e
wren
t
6
036,
t
6
042: prefer t
e
s
t
_cm
p
to sequences o
f
test
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next