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
El
i
jah Newren
git-rebas
e
.
tx
t
: update note about
d
i
r
ectory rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
E
l
ijah
N
ewren
fast-
e
xport: add a --show-original-ids option to show
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah Newren
fast-import: remove unmaintained duplicate documentati
o
n
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah Newren
fa
s
t-e
x
p
ort: add
-
-reference-excluded-parents
option
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah Newren
fast-export: ensure we export requeste
d
ref
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
E
l
ijah
N
ewren
fast-export: when using
p
aths, av
o
id corrupt s
t
ream
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
E
l
ij
a
h Ne
w
ren
fast-export: mo
v
e commit rewriting logic into a func
t
i
o
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah
N
ewren
fast-e
x
port: avoid dy
i
ng w
h
en
f
iltering by
p
aths
a
nd
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Eli
j
ah Newren
fa
s
t-export: use value f
r
om correct enum
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah Newren
git-fast-
e
xport
.
t
xt: clarify misleadin
g
documentation
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Eli
j
ah N
e
wren
git-
f
ast
-
i
m
p
ort
.
txt
:
fix do
c
umentati
o
n for --quiet
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah Newren
fast-export: conv
e
rt sha1 to
o
id
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
El
i
j
ah Newr
e
n
t
6036, t6043: increase code
coverage
f
or
file
c
olli
s
ion
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elijah Newren
m
e
rge-recu
r
si
v
e:
i
m
p
rove ren
a
m
e
/
rename(1to2)/add[/ad
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elij
a
h
Newren
me
r
ge-r
e
c
u
rsi
v
e
:
use han
d
l
e
_file_coll
i
sion
f
or
a
d
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elijah Newren
me
r
ge-recursive:
i
m
prove handling
for r
e
name
/
rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elijah Newren
merge-recur
s
ive
:
f
i
x rename/ad
d
conf
l
ict handlin
g
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elijah
N
e
wre
n
merge-recur
s
ive
:
new function for better colli
d
i
ng
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elijah
N
ewr
e
n
merge-recu
r
sive: increase
marker l
e
ngth with depth
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elijah Newren
t6036, t60
4
2
:
testcas
e
s
f
or renam
e
collisi
o
n
of a
l
ready
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
El
i
ja
h
Newren
t
6042: a
d
d tests fo
r
cons
i
s
t
ency in file collision
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-10-22
E
l
ij
a
h
Newren
fsck: mo
v
e fsck_head_link() to get_default_heads()
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-10-18
Elij
a
h New
r
en
merge-recursive: avoid
s
h
owing conflicts with me
r
ge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-10-18
Elijah
New
r
e
n
merge-recursive: improve auto
-
mer
g
in
g
messa
g
es with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-27
Elijah
Newren
c
ommit:
fix erroneous BU
G
,
'
multipl
e
rena
m
es on the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-20
Elijah
Newren
merge-recursive: rename
me
r
g
e_file
_
1
() an
d
m
erge_co
n
t
e
nt()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-20
Elijah Newren
merge
-
recursive
:
r
e
move
final
r
emaining
c
al
l
er of me
r
ge_
f
ile
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-20
Elijah Newr
e
n
merge-recursi
v
e: a
v
oid wr
a
pper func
t
ion when
unnecessary
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-20
E
l
i
j
ah Newren
merge-recursive: set
path
s
correctl
y
when t
h
r
e
e-way
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-13
E
l
ijah
Newren
s
equence
r
: fix --allow-empty-message
b
ehavio
r
, make
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-12
Eli
j
ah N
e
w
r
en
upd
a
t
e
-
r
e
f: allow --no-deref with --stdin
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-12
Elijah Newren
updat
e
-ref: fi
x
type of update_flag
s
variab
l
e to match
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-11
E
l
ijah Newren
rerere
:
avoid buffer
o
v
e
rrun
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-11
Elijah Newren
t4200: demons
t
r
at
e
rerere segf
a
ult on special
l
y crafted
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-05
Elijah Newren
Remove superfluous tr
a
i
l
in
g
semi
c
olo
n
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-30
Elijah Newren
am: avoid directory rena
m
e detection when ca
l
ling recursive
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-30
Elija
h
Newren
merge-recursive:
a
dd
ability to tu
r
n
of
f
directory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-30
Elijah N
e
wren
t3401: add an
o
ther dir
e
ctory
r
en
a
me
t
e
st
c
a
s
e
for rebase
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
E
l
i
jah Ne
w
ren
Remove fo
r
ward declaration of an enum
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elija
h
Ne
w
ren
co
m
pa
t
/precom
p
ose_utf
8
.
h: use more
com
m
o
n
incl
u
de
gua
r
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elijah Newren
u
r
lmatc
h
.
h: fix
incl
u
de guar
d
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elijah
Newren
Move defin
i
tion of en
u
m branch_
t
rack
from c
a
che
.
h to
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elijah Newren
alloc: make al
l
ocate_
a
lloc_stat
e
and
clear_alloc_st
a
te
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elijah
N
ew
r
en
Add missi
n
g i
n
c
ludes an
d
f
orward declarat
i
on
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elijah Ne
w
ren
git-
u
pdate-index
.
txt: reword poss
i
bly confusing example
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elijah N
e
wren
t7406: avoi
d
using test
_
must_fail
for commands o
t
her
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elija
h
Newren
t7
4
06:
prefer te
s
t_*
h
elp
e
r functions t
o
tes
t
-[fe
d
s]
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elija
h
Newren
t7406: avoi
d
having git commands
u
pstream of a pipe
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elijah Newr
e
n
t
7
406:
s
i
m
p
l
ify b
y
using diff --name-onl
y
instead of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
E
l
i
j
ah Newren
t7406: fi
x
cal
l
that was f
a
iling for the wrong reason
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-06
E
lijah Newren
t3031: upd
a
te test des
c
ription to men
t
ion desired behavior
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-31
Elijah Ne
w
r
en
r
e
ad
-
cache: fi
x
directory/file co
n
flict hand
l
ing
i
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-31
Elijah Newren
t1015: d
e
monstrate
d
ire
c
tor
y
/fi
l
e conflict
recovery
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-27
E
l
ijah
Newren
merge-
r
e
cursive: pr
e
serve skip_workt
r
ee
bit when ne
c
e
ssary
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elija
h
N
e
w
ren
t7405: verify 'merg
e
--ab
o
rt'
w
orks af
t
er
submodule
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newren
t7405: ad
d
a dire
c
to
r
y
/submodule conflict
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah New
r
e
n
t7405: add a file/sub
m
o
dule c
o
nflict
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
E
l
ijah Newren
merg
e
:
fix misle
a
ding pre-merge check
do
c
umentation
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newren
merge-rec
u
rsive: en
f
orce
r
ule that index
matches head
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newre
n
t6044: add
m
ore tes
t
c
a
s
e
s with staged ch
a
nges bef
o
re
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newren
merge-recurs
i
ve: fix assumption that head
t
ree being
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
El
i
jah Newren
merge-recu
r
sive:
make su
r
e
w
hen we say
w
e abort t
h
at
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah
Ne
w
ren
t
6
044: add a t
e
s
t
c
ase for i
n
dex matching head, when
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Ne
w
ren
t603
6
: add a failed conflic
t
d
e
tection
c
a
se: regu
l
ar
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-06
Elijah N
e
wren
t6036: add lots o
f
det
a
i
l
fo
r
director
y
/
f
ile confl
i
cts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
El
i
jah Newre
n
t6042: ad
d
testcase
c
overing l
o
ng chains of r
e
name
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Eli
j
ah
N
ewren
t6
0
42: add tes
t
case
cov
e
r
i
ng re
n
a
m
e/renam
e
(
2
to1)/delete
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elij
a
h Newren
t6042:
a
d
d
testcase
c
o
vering rename/a
d
d/d
e
l
e
te c
o
nflict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Ne
w
ren
t6036: add a
f
a
iled confl
i
ct detection case with conflicting
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Eli
j
ah
New
r
en
t6036: add a failed conflict detection
case with s
u
bmodul
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newren
t6036: add a f
a
il
e
d c
o
nflict detection c
a
se with submodule
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newren
t
6
036: add a
failed c
o
nflict detecti
o
n
cas
e
wi
t
h symlink
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newren
t603
6
: add a failed conflic
t
detection case wit
h
symlink
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah
N
ewre
n
t6044: ve
r
ify tha
t
merge
s
e
x
pected
t
o abort actually
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newr
e
n
index_has
_
changes
(
): avoid assum
i
ng operat
i
n
g
o
n the_index
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elija
h
Newre
n
r
ead-cache
.
c: move index_has
_
changes() from mer
g
e
.
c
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-28
Elij
a
h
Newren
t5407: fi
x
te
s
t to cover
i
n
t
ended a
r
gument
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-28
E
lijah Newren
appl
y
:
fi
x
grammar error in comment
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elija
h
New
r
e
n
git-rebas
e
--merge: modernize
"
g
i
t
-$cmd"
to "gi
t
$cm
d
"
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elij
a
h Newren
Fix use of stra
t
egy o
p
tions
w
ith interac
t
ive r
e
bases
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Eli
j
ah Newren
t3418: add
t
e
stc
a
se showing problems
wit
h
reba
s
e -i
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah
N
e
wren
g
it-reb
a
se: make --allow-empty
-
message the defa
u
l
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
E
l
i
jah Newre
n
t3401: add director
y
rename testcas
e
s fo
r
rebase and am
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah New
r
en
git-rebase
.
t
x
t:
documen
t
behavioral differences between
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah
Newren
di
r
ect
o
ry-rename-d
e
t
e
ction
.
txt:
t
echnical
docs on ab
i
lities
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Ne
w
ren
git-r
e
base
.
txt: address confusion b
e
t
ween -
-
n
o
-
f
f vs
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
El
i
jah Newren
git-re
b
ase:
error
o
ut when incom
p
atible options pa
s
sed
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
E
l
i
jah Newre
n
t
3
422: new testcases for checking when incom
p
ati
b
le
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-26
Elijah Newren
git-re
b
a
s
e
.
s
h: update
h
el
p
mes
s
ag
e
s a bit
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-26
Elijah Newren
gi
t
-rebase
.
txt:
d
ocument in
c
ompatible options
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-13
Elijah Newre
n
RelNotes 2
.
18
:
cla
r
ify where
d
irector
y
r
e
n
a
me det
e
c
t
i
on
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
El
i
jah Newre
n
merge-rec
u
rsive: add pointer about
unduly c
o
mplex looki
n
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
Elijah Newren
merge-recur
s
ive: rename conflict_rename_*() family
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
E
lijah New
r
en
m
e
rge-recursive
:
cl
a
r
i
f
y
the rename
_
dir/RENAME_D
I
R
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
Elijah
N
ewren
merge-r
e
curs
i
ve: align la
b
e
l
s with their respective
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
E
l
ijah Newren
merg
e
-recu
r
sive: fix numerous argu
m
en
t
alignm
e
nt is
s
ues
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
Elijah Newren
me
r
ge-recursive: fix m
i
scellan
e
ous grammar error in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-01
El
i
jah Newren
Rel
N
otes: re
m
ove duplicat
e
releas
e
note
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Elijah
N
e
w
ren
t
6036: prefer test_when
_
finish
e
d
to man
u
al cleanup
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Elijah N
e
wren
t6
0
3
6
, t6042: pref
e
r test_c
m
p to
s
equence
s
o
f
test
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next