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/completion-typofix'
2018-12-09
Elij
a
h Ne
w
ren
git-rebase
.
txt: update note
abo
u
t
dir
e
c
tory renam
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah Newren
f
ast-exp
o
rt: add
a --show-original-ids option
t
o show
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
El
i
jah Newren
fast-import: r
e
move unmaintained
d
upli
c
ate documentation
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah
N
ewren
fast-export: add -
-
reference-excluded-parents
optio
n
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah Newren
fast-ex
p
ort: ensure we
e
xpo
r
t requ
e
s
t
ed refs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Eli
j
ah N
e
wr
e
n
fast-
e
xport: when using p
a
ths
,
a
void corrupt stream
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
E
l
ijah Newren
fast-export: move co
m
mit
rew
r
i
t
ing
logic into
a f
u
nction
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
E
l
i
jah
Newren
fast
-
export: avoi
d
dying w
h
en fil
t
e
ring by pa
t
hs and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah
Newren
fast-export: use
v
a
lue fr
o
m correc
t
enum
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah Newren
gi
t
-fast-export
.
t
x
t: clarify
m
i
s
l
ea
d
i
ng documentation
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
E
l
ijah Newre
n
git
-
f
a
st-
i
mp
o
rt
.
txt
:
fi
x
d
o
cumenta
t
ion for --
q
uiet
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elija
h
Newr
e
n
fas
t
-export: c
o
nvert sha1 to
oid
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elijah N
e
wr
e
n
t6
0
36, t6043
:
increase cod
e
c
overage for file c
o
llision
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
E
lijah
N
ewren
m
erg
e
-r
e
c
ursive:
im
p
rove ren
a
m
e
/re
n
a
me(1to
2
)/ad
d
[/
a
dd
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
E
lijah Newren
merge-recursive: u
s
e han
d
le_file_
c
ollision for
add
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
E
lijah Newren
mer
g
e-recur
s
i
v
e: impro
v
e handling for rename/rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elijah Newren
merge-recursive:
f
i
x rena
m
e/ad
d
con
f
lict handling
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
El
i
jah Newren
merge-recursive: new function for b
e
tte
r
colliding
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Eli
j
ah
New
r
en
merge-recursive: increase marker len
g
th w
i
t
h
depth
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elijah Newren
t6036, t6
0
42: testcas
e
s for renam
e
collision
o
f
a
lre
a
dy
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elijah Newren
t6042: add tests for c
o
nsistency in fil
e
collis
i
on
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-10-22
El
i
j
a
h Newren
fs
c
k
: m
o
ve fsck_head_
l
ink() to get
_
default_hea
d
s
(
)
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-10-18
Elijah Newren
merge
-
r
e
cursive: avoid showing confl
i
cts with
m
erge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-10-18
Elijah New
r
e
n
merge-r
e
cursive: improve
auto-me
r
ging me
s
s
ages w
i
t
h
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-27
Elijah
Newren
commit: fix erroneo
u
s BUG, 'multipl
e
r
enames on the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-20
Elijah Newre
n
merge-recursive: rename
m
erge_file_
1
()
a
nd merge_content()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-20
Elijah Newren
m
e
rge-recursive:
r
emove fi
n
al remaining call
e
r of mer
g
e_file
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-20
Elija
h
Newren
merge-recursi
v
e: avoid wra
p
per function when unnecessary
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-20
El
i
ja
h
Newren
merge-rec
u
rsiv
e
: set paths correctly when
thre
e
-way
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-13
El
i
jah Newren
sequencer: fix --allow-empty-message beh
a
vio
r
, mak
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-12
El
i
jah Newren
u
p
d
a
te-ref: allow --no-deref
with --stdin
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-12
Elijah Newren
upda
t
e-ref: fi
x
type of update
_
flags v
a
riab
l
e to matc
h
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-11
Elijah New
r
e
n
r
ere
r
e: avoid
buffer overrun
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-11
Elijah Ne
w
ren
t4200: demonstrate rer
e
re segfa
u
lt o
n
specially crafted
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-05
Elij
a
h Newren
Remove superflu
o
us trailing semicolons
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-30
Elijah Newren
am: avoid dire
c
tory rename detection
w
h
e
n calling recursive
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-30
E
lijah Newren
m
erge-recursive: add
ability to t
u
rn off dire
c
tory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-30
Elijah Newren
t3
4
0
1:
add another directory rename test
c
a
s
e for reba
s
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
E
lijah Newre
n
Remo
v
e forward declara
t
ion of an e
n
um
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
E
lijah Newren
compat/precompose_
u
tf8
.
h: use more
commo
n
i
n
c
l
ude guard
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Eli
j
a
h
Newren
urlmatch
.
h: fix
i
nclude guard
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elijah Newren
Move definit
i
on of
e
num bra
n
ch_track from cache
.
h
t
o
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elijah Newren
a
lloc:
m
ake
alloca
t
e_all
o
c_state and cle
a
r_alloc_state
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
E
l
i
jah Newren
Add missing includes
a
nd forw
a
rd declarations
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elijah
Newren
gi
t
-u
p
date-index
.
txt
:
rewor
d
possi
b
ly confusing example
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Eli
j
ah Newren
t7406:
a
v
oid using te
s
t_must_f
a
il for commands other
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elijah N
e
wren
t
7406: prefer test_* h
e
lper
f
u
n
ctions to
test -
[
feds]
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elijah Newren
t7406: avoid having git
commands
upst
r
eam of a pipe
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elijah Newr
e
n
t7406: simplify by u
s
ing diff
--nam
e
-only instead of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elijah Newren
t
7
406:
f
ix call that was fail
i
ng for the w
r
o
n
g re
a
son
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-06
Elijah Newr
e
n
t3031: update test description to mention d
e
sired behavior
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-31
Elijah Newren
read-cac
h
e:
f
i
x
di
r
ectory/
f
ile conflict handling in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-31
Elijah Newr
e
n
t
1
0
15:
d
em
o
nstra
t
e d
i
r
e
ct
o
ry/file
conflict recovery
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-27
Elijah Newren
m
erge-recursive: preserve skip_workt
r
ee b
i
t whe
n
necessary
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
E
l
i
jah Newren
t
740
5
: verify 'mer
g
e
-
-abor
t
' works
after submodule
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
El
i
j
a
h
Newren
t7405: a
d
d a directo
r
y/submodu
l
e conflict
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
E
l
ij
a
h Newren
t
7405: add
a file/submodu
l
e conflict
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Ne
w
ren
merge: fix mis
l
eading pre-me
r
ge check documentation
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newren
merg
e
-recursiv
e
:
enforce rule that ind
e
x matches he
a
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elija
h
Ne
w
ren
t6044: add more testcases w
i
th
staged chan
g
es before
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah New
r
en
merge
-
recursive: fix assumptio
n
tha
t
head tree being
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
E
lijah Newren
merge-recursiv
e
: mak
e
sure
w
hen
w
e say we
abort that
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newren
t6044:
add a testcase
f
or i
n
dex matchi
n
g hea
d
,
w
hen
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elij
a
h
Newren
t6036
:
a
dd a
failed con
f
lict de
t
e
ction case: regul
a
r
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-06
Elijah Newren
t
60
3
6: add lots
o
f d
e
t
a
il for
dire
c
t
o
r
y
/f
i
l
e
c
onf
l
i
cts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah
N
ew
r
e
n
t
6042:
a
dd testcase covering l
o
ng chain
s
o
f renam
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newren
t6042: a
d
d t
e
stcase
c
overing rename/rename(2to1)/delete
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elija
h
Newr
e
n
t
6
042:
a
d
d te
s
tcase
covering rename/add/delete conf
l
ict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Eli
j
ah Newren
t
6036: add a f
a
iled conflict detect
i
on case with con
f
licting
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newr
e
n
t
6
036: a
d
d a failed confli
c
t detection case with submod
u
le
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newren
t6036: add a fail
e
d conflict
d
etectio
n
case wit
h
sub
m
odule
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah
N
e
wren
t6036: add a f
a
il
e
d
confli
c
t detection ca
s
e
with s
y
mlink
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newren
t6036
:
add a failed co
n
flict detection
case with
s
ymlink
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Eli
j
ah Newren
t604
4
: verify
th
a
t m
e
rges
e
xpe
c
ted to abort
actually
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Ne
w
ren
index_
h
as_
c
hange
s
(
): avoid
a
ssuming opera
t
ing on the_i
n
dex
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
El
i
jah Newren
re
a
d-cache
.
c: mo
v
e index_has
_
changes() f
r
om merge
.
c
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-28
El
i
jah Newren
t54
0
7: fix test to
c
over inte
n
ded ar
g
uments
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-28
Elijah Newren
app
l
y: fix
g
rammar error in comment
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
El
i
j
a
h Newren
git-rebase--
m
e
rge:
m
odernize "
g
i
t
-$cmd" to "git $cmd"
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elija
h
Newren
Fix use
o
f strat
e
gy options with i
n
t
erac
t
ive
rebases
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Newren
t3418: add tes
t
case showing problems with re
b
ase -
i
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
E
lijah
N
ewren
gi
t
-rebase: make -
-
allo
w
-empty-message the
default
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
E
l
ijah N
e
wre
n
t3401: add d
i
rectory rena
m
e testcas
e
s for
r
ebase and
am
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
E
l
ijah Newren
git-r
e
base
.
t
x
t: doc
u
m
e
nt be
h
a
vioral differenc
e
s
betwee
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Newren
directory-ren
a
me-detection
.
t
xt:
t
e
chnical docs on abilities
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
El
i
jah Newr
e
n
git
-
rebase
.
txt: address confus
i
on between
-
-
n
o-ff vs
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Eli
j
ah Newren
git-rebase: error
o
ut w
h
e
n incompatible
o
ptions
p
assed
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Ne
w
ren
t34
2
2: n
e
w testca
s
es f
o
r checking when incompati
b
le
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-26
El
i
jah Newr
e
n
gi
t
-r
e
base
.
sh: up
d
ate hel
p
messages a
bit
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-26
Elijah Newr
e
n
git-reb
a
se
.
t
x
t
:
document
incompat
i
b
le
options
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-13
Elij
a
h
N
ewren
RelN
o
te
s
2
.
18: cla
r
ify where directory rename det
e
ction
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
Elij
a
h Ne
w
r
en
m
e
rge-recursi
v
e: add pointer about unduly
compl
e
x looking
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
Eli
j
ah Newren
m
e
rge
-
re
c
ursive:
rename conflict
_
r
e
name_*() f
a
mi
l
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
Elijah Newren
merg
e
-
recursiv
e
: clarify
the
re
n
ame_dir/RENAME_DIR
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
Elijah Newren
merge-recurs
i
ve: alig
n
labels with their r
e
spective
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
Elij
a
h Newren
mer
g
e-recursive: fix numer
o
us
argum
e
nt align
m
ent i
s
su
e
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
Elijah Newre
n
merge-rec
u
rsive
:
fix
mi
s
cellaneous grammar error
in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-01
Elijah N
e
wren
RelNotes: re
m
ove d
u
pli
c
a
te rele
a
se note
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Eli
j
ah
N
ewren
t6036: prefer test_when_
f
inished to man
u
al clea
n
up
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
El
i
jah N
e
wren
t6
0
36, t6042: prefer t
e
s
t
_cmp
t
o seque
n
ces of
test
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next