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-recursive: Move handling of double rename of one file to two
2010-09-30
Elijah Newren
mer
g
e-recurs
i
ve: M
o
ve handlin
g
of double rename o
f
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elija
h
Newren
merg
e
-re
c
ursive: Avoid doubly
m
er
g
ing rename/add conf
l
ict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Eli
j
a
h N
e
wren
m
er
g
e-recursive
:
Update merge_content() c
a
l
l
sig
n
ature
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
l
ijah N
e
w
r
en
merge
-
recur
s
ive: Upda
t
e c
o
nflict_rename
_
rename
_
1to2
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Eli
j
ah Newren
m
erge
-
r
e
cursive: Stru
c
ture process_df
_
en
t
ry(
)
t
o handl
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
El
i
jah Newren
merge-recursive:
Have process_entry() skip
D/F or rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Eli
j
ah
Newr
e
n
mer
g
e
-recursive: New f
u
ncti
o
n to assist
reso
l
ving renames
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
me
r
ge-
r
e
cursive: New data structures
for deferring
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
l
ijah Ne
w
ren
merge-re
c
ursiv
e
: Mo
v
e
proces
s
_entry's content
m
erging
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Ne
w
ren
me
r
g
e-recu
r
sive: Move
delet
e
/modify ha
n
dling into d
e
d
icated
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elij
a
h Newren
merge-recursive:
Move r
e
name/delet
e
h
an
d
ling int
o
d
e
dicated
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elija
h
Newren
merge-recursive
:
Nuke rename/directory conflict detection
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merge-recursive: Rename conflict_rename_rename*() fo
r
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newr
e
n
merge-recurs
i
ve: Small code cl
a
rification -- variable
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah New
r
en
t6036:
Ad
d
testcase f
o
r undetec
t
ed co
n
f
l
ict
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
El
i
jah Newren
t6036: Add
a
se
c
on
d
testcase simila
r
to the first but
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah New
r
en
t
6
036: T
e
st i
n
dex and w
o
r
kt
r
ee state
,
not just that
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
t60
2
0
:
Add
a
testcase for
m
odify/delete + directory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
lijah Newren
t6020: Moderni
z
e sty
l
e a
bit
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
t6022: Add t
e
sts fo
r
rename/ren
a
me combined with D
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elij
a
h Newren
t6022:
Add paired rename
+
D/F conflic
t
: (
t
wo
/
file, one
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
t602
2
:
A
d
d tests with
b
o
t
h r
e
name
sou
r
ce
& dest i
n
volved
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
t6022:
A
dd tests for
r
e
v
ersing
o
rder
o
f merg
e
s wh
e
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
l
ijah Ne
w
re
n
t6022: Add
test combina
t
io
n
s of {c
o
ntent
c
onflict?
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elij
a
h Newren
t6032: Add
a
test checking
fo
r
excessive output from
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-10
Elijah Newre
n
merge-r
e
cursive: D/F confli
c
ts where was_a_dir/f
i
l
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-10
Elijah Newren
t3509: A
d
d renam
e
+ D/F conflict testcase th
a
t recursiv
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-07
Elija
h
Newren
revert:
F
i
x
t
r
ivi
a
l comment style issue
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-07
Elija
h
Newren
cache_tree_free:
F
ix sma
l
l memory l
e
ak
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-25
Elij
a
h Newren
t
ree-
w
al
k
: Correct
b
it
r
otted com
m
ent about tree_entr
y
()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-20
Elijah Ne
w
ren
merge-rec
u
r
sive:
Av
o
id
exce
s
sive output for
a
nd reprocessi
n
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Elijah Newre
n
merge-rec
u
r
s
ive
:
F
ix mult
i
ple file rename across D
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Elijah Newren
t6031: Add a
t
est
c
as
e
covering mul
t
i
ple ren
a
me
s
across
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Elijah Newre
n
merge
-
recursive:
F
i
x typo
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-13
Elijah Newren
Mark tests that use symlin
k
s
as
needing SYMLINKS
prerequ
i
site
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-13
Elijah Newren
pull --rebase: Avoid spurious con
f
licts and reapplying
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-13
Elij
a
h
N
e
wren
t5
5
20-pull
:
Add
t
e
s
t
cases sh
o
wing spu
r
io
u
s co
n
flicts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-02
Elijah Newren
upload-pa
c
k: Impro
v
e
e
r
ror me
s
sage when bad
r
ef reques
t
e
d
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
E
lijah Newren
fast-expor
t
: Ad
d
a --full-tre
e
op
t
ion
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
El
i
jah Newren
fast-export: Fix
dr
o
pping of files
w
ith --impo
r
t-marks
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-09
Elijah Newr
e
n
fast-import
:
Improve
r
o
b
u
s
tness when D->
F
cha
n
ges
p
r
o
v
ided
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-09
Elijah Newren
f
a
st-
e
xpo
r
t: Fix out
p
ut order
o
f D/F changes
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-09
Elijah Newren
merge_recursive: F
i
x ren
a
mes across paths
b
elow D/
F
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-09
Elijah Newren
merge-recursive: Fix D/F conf
l
icts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-09
Elijah Newren
A
dd additional testc
a
ses for D/F con
f
licts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
E
l
ijah Newren
fast
-
export: Document the fact that git-rev-list arguments
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
Eli
j
ah Ne
w
ren
Add new
f
ast-export testcases
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
Eli
j
ah Newren
fast-expor
t
: Add
a
--t
a
g-of-filtered-object option
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
Elijah Newre
n
fast-export: Do parent
rewriting
t
o a
v
oid drop
p
ing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
Elijah Newr
e
n
fast-export: Make s
u
re
w
e sh
o
w
actual ref
n
ames instead
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
E
lijah Newren
fast-expo
r
t: Omit
t
ags t
h
at tag trees
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
Eli
j
ah Newre
n
fast-export: Set re
v
s
.
topo_or
d
er before calling s
e
tup_revisions
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-05-16
E
lij
a
h Newren
gitk: Make more o
p
tions easily accessi
b
le
f
rom
E
dit
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-03-26
Elij
a
h Newren
fast
-
export: Avoid drop
p
i
n
g files from co
m
m
it
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-03-25
Elijah Newren
Co
r
rect
m
issing SP characters in gramm
a
r comm
e
nt at
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-03-25
E
l
ijah Newre
n
gi
t
-filter-branch:
avoid co
l
li
s
ions w
i
t
h
variables
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-02-28
E
l
i
jah Newren
Ensure
proper setup of git_d
i
r
f
or git-hash-objec
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-02-12
Elijah
N
ewr
e
n
f
a
st-
e
xport
:
e
n
s
u
re we tra
v
erse commits in top
o
logica
l
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree