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 'jk/merge-subtree-heuristics'
2018-07-27
Elijah Newr
e
n
merge-recursive: preserve
s
kip_worktr
e
e bit when
nec
e
ssa
r
y
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newren
t
7405: verif
y
'merge
-
-abort' wo
r
ks aft
e
r submodule
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newren
t7405:
a
dd a dir
e
ctory/submodule conflict
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newren
t
7405: add a file/submo
d
ule conflict
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
El
i
jah Newren
merge: fix
m
islea
d
ing pr
e
-m
e
rge check document
a
tion
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah
N
e
wren
merg
e
-
recursive: en
f
orce rule
that
in
d
ex matc
h
es head
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah New
r
en
t6044:
a
dd more testcase
s
with staged chan
g
es before
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah
Newren
merge-recursive: fix ass
u
mp
t
io
n
t
h
at he
a
d tree being
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Eli
j
ah New
r
en
m
e
rg
e
-recursive
:
make sure
when we sa
y
we ab
o
rt that
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newren
t6
0
44:
a
dd a test
c
a
s
e fo
r
i
n
dex matching head,
w
h
en
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Ne
w
r
e
n
t6036: add a failed conflict detection case:
r
egu
l
ar
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-06
Elija
h
N
ewren
t6036: add
l
ots of deta
i
l for directo
r
y/file conflicts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Eli
j
ah Newren
t6042: ad
d
te
s
tc
a
se cover
i
ng long chains
of
r
e
name
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
E
lijah
N
ewren
t6042: add testcase cov
e
ring rename/rename(2
t
o1)/delete
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Eli
j
ah Newren
t
6
042: add t
e
stcase c
o
vering rename/add
/
delete co
n
flict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
El
i
jah Newren
t6036: add
a failed con
f
l
i
ct detection case with confl
i
cting
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah
Newren
t6036: add a failed co
n
flict d
e
t
e
ction case with submod
u
le
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah
N
e
wren
t
6
03
6
: add a
f
a
iled conflict detection case with submod
u
l
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah
N
ewren
t6036
:
a
d
d a fa
i
l
e
d con
f
lict
detection case with
s
ymlink
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
E
l
i
j
ah Newren
t6036:
add a failed
c
onflict detection case
w
ith symlink
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elij
a
h
Ne
w
ren
t
604
4
: verify that merg
e
s expec
t
ed to abort
actually
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Ne
w
r
e
n
index_has_chan
g
es(): avo
i
d assu
m
ing operating on the_index
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
E
lijah New
r
e
n
re
a
d-cach
e
.
c: move index_has_chan
g
es
(
) from merge
.
c
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-28
El
i
jah Newren
t5407: fix t
e
st to co
v
e
r inten
d
ed a
r
guments
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-28
E
lij
a
h N
e
wren
apply: fi
x
grammar
e
rror in comme
n
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Newren
g
i
t-rebase--
m
erg
e
: m
o
derniz
e
"gi
t
-$cmd" to
"
git $cmd"
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elij
a
h Newren
Fix use of s
t
rategy options with interact
i
ve rebases
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elij
a
h Newr
e
n
t3418: a
d
d testc
a
se
s
howing problems with re
b
ase -i
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Ne
w
r
e
n
git-rebase
:
make --allo
w
-empty-message the default
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah
N
ewren
t3401: add d
i
rectory rename testca
s
es for rebase
a
nd am
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elij
a
h Newren
git-rebase
.
t
x
t: document behavioral
d
i
fferences be
t
w
e
e
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Eli
j
ah Newr
e
n
directory-rename-dete
c
t
ion
.
txt: technical docs o
n
abilities
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Newren
g
it-r
e
base
.
txt: address con
f
usion between
--no-ff vs
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Eli
j
a
h Newren
g
i
t-re
b
ase: e
r
ror out
w
he
n
incompatible o
p
t
ion
s
passed
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
E
lij
a
h Newren
t3422
:
ne
w
testc
a
ses for c
h
ecking
w
h
en incompatible
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-26
Elijah Newren
git-reb
a
se
.
sh: update help messa
g
es
a bit
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-26
Eli
j
ah Ne
w
ren
git-rebase
.
t
xt: document incompatible options
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-13
E
lijah Ne
w
ren
R
e
l
N
ote
s
2
.
1
8: cl
a
ri
f
y where directory ren
a
me
d
et
e
c
tion
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
Elijah Ne
w
r
e
n
merge-re
c
ursive:
add p
o
inter ab
o
ut undu
l
y complex looking
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
E
l
i
j
ah Newre
n
merge-recursiv
e
: rename conflict_rename_*() family
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
Elij
a
h
N
ewren
merge-rec
u
rsive: clari
f
y the rename_dir/R
E
N
AME_DIR
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
Elijah
N
ewren
merge-
r
ecursive
:
align labels with the
i
r
r
es
p
ect
i
ve
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
Elijah Newren
mer
g
e-recur
s
ive:
f
ix nume
r
ous argument alignment issues
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
Elijah Newren
merge-r
e
cursive: fix miscellaneou
s
gra
m
mar error
i
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-01
Elija
h
N
e
wren
RelNotes: remov
e
dup
l
icate rele
a
s
e
n
ote
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Elija
h
Newren
t6036: prefer te
s
t_when_finished to
m
anual c
l
eanup
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Elijah N
e
w
ren
t
6
036,
t6
0
42: prefer te
s
t
_
cmp t
o
seq
u
ences of
t
e
st
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Elijah
N
ewren
t
6
0
3
6,
t6042: prefer test_path
_
i
s
_file, test_path_is_missing
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
E
l
ijah Newren
t6036,
t
6042:
u
se test_line_count instead of wc -l
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Elijah Newren
t6036,
t60
4
2: us
e
test_
c
reate_repo to keep tes
t
s indepen
d
en
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-25
Elijah Newren
rev-parse: check lookup'ed commit
refer
e
nces for N
U
LL
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-20
Elijah
N
ewr
e
n
merge-
r
e
c
ursive:
p
rovide pair of `unpack_trees
_
{
star
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
l
ija
h
Newren
merge-recurs
i
ve: fix check for skipability of wo
r
k
i
ng
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newre
n
m
e
rge-recursive: make "Aut
o
-merging" commen
t
show for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge
-
recursive:
fix
r
emainder of was_di
r
ty() to u
s
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
mer
g
e-recursive: f
i
x was_tracked
(
)
t
o quit lying with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
lijah N
e
wr
e
n
t6046: testcases checki
n
g whether
upda
t
es can b
e
sk
i
pped
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
El
i
jah Newren
mer
g
e-recu
r
sive: av
o
id trigge
r
ing add_cacheinfo er
r
or
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
El
i
jah Newre
n
merge-recu
r
s
i
ve: move more
i
s_dirty h
a
nd
l
i
n
g to
m
er
g
e
_
c
ontent
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah
N
ewren
merge-rec
u
rsive: improve add_cacheinfo e
r
ror
handling
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah
Newre
n
m
e
rge-recursi
v
e: avoid spurious
r
ename/renam
e
confl
i
ct
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elija
h
Newren
director
y
rename de
t
ec
t
ion: new t
e
st
c
ases s
h
owc
a
sing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah New
r
e
n
merge-re
c
ursive: fix
remaining director
y
rename
+
dirty
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
l
i
jah Newren
me
r
ge-recursive: fix ov
e
r
writing d
i
r
t
y files involved
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-recursive: avoid clobberin
g
untracked files with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merg
e
-recursiv
e
: apply neces
s
ary m
o
difi
c
ati
o
ns
for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah New
r
en
merge-
r
ecur
s
ive: w
h
en comparing files,
d
o
n'
t
i
n
clude
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elija
h
Newr
e
n
merge-recur
s
ive:
check for fil
e
level conflicts then
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elij
a
h New
r
en
merge-recursive: add c
o
mputati
o
n of collisions
d
ue
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elija
h
Newren
merge-recursive:
check
f
o
r d
i
re
c
tory level conflicts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-recursive: add
g
e
t
_director
y
_renames()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-02
Elijah
N
ewre
n
unpack_trees: f
i
x break
a
ge when o->src_in
d
ex != o-
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-25
El
i
j
ah Newr
e
n
Ma
k
e running gi
t
under other debugger-like programs
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
E
lijah Newren
merge-re
c
ursive:
m
ake a helper
fu
n
c
t
ion for cl
e
a
n
up
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
merg
e
-recursive: spli
t
out code
for det
e
rmining diff
_
filep
a
irs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
E
li
j
ah Newren
merge-recursive: make !
o
->detec
t
_rename
c
odepath more
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah N
e
wren
merge
-
r
e
c
ursive: fix leaks of al
l
oc
a
ted r
e
na
m
e
s
a
n
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
merge-rec
u
rsiv
e
: introduce new functio
n
s to h
a
n
dle
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
E
l
ijah N
e
wren
merge-recursive: move
the get_r
e
names
(
) f
u
nction
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Eli
j
ah New
r
e
n
directo
r
y rename
detection:
t
e
sts
f
o
r
h
andling overw
r
iting
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
E
l
ijah Newren
dire
c
tory rename
d
etection: tests for han
d
li
n
g over
w
ri
t
ing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
directory rename detection: miscell
a
neou
s
testcas
e
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
d
i
re
c
tory r
e
name detection
:
tes
t
cases explo
r
i
ng pos
s
ibly
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah
N
ewr
e
n
dir
e
c
tor
y
ren
a
me detection: more involved edge/co
r
ner
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newr
e
n
directory rename d
e
tection:
testcases checking which
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
E
l
ijah Ne
w
ren
directory re
n
ame d
e
tection: files
/
directories in the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
directory
rename
det
e
c
t
i
on: parti
a
l
l
y rena
m
e
d directory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newre
n
d
i
rec
t
ory renam
e
detecti
o
n
:
tes
t
cas
e
s to avoid takin
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah
N
e
w
ren
dire
c
tory rename detection: directory spl
i
tting test
c
ases
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elij
a
h Newr
e
n
director
y
rename det
e
c
t
ion
:
basi
c
testc
a
ses
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-09
Elija
h
Newren
Documentation:
norma
l
i
ze spelling of 'no
r
m
a
lised
'
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-09
Eli
j
ah Newren
D
o
cum
e
ntation: fix
several one
-
character-off spell
i
n
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Eli
j
ah
N
ewren
merge-r
e
curs
i
ve: ensure we write updates for
d
irect
o
ry
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
E
l
ijah
Newren
merge-
r
ecur
s
ive: avoid spurious rename
/
rename conflict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah Newren
d
irectory rename detection
:
new testcases showcas
i
ng
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah
Newren
merge-recursi
v
e:
fix rem
a
ining directory
ren
a
m
e
+
dirty
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah
Newren
m
e
rge-rec
u
rsiv
e
: fix
ove
r
writing dirty files invo
l
ved
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
E
li
j
ah Newren
merg
e
-recursive: avoid clobbering
u
ntrack
e
d files w
i
th
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah Newren
me
r
ge-recur
s
ive: appl
y
n
e
c
essar
y
modificatio
n
s for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah New
r
en
merge-rec
u
rsi
v
e: wh
e
n
c
omparing files, don't include
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next