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 other file
2010-09-30
E
lijah Newren
merge-
r
ecursive
:
Move handling of double rename of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah
N
ewren
merge
-
recursive: Move handli
n
g of double rename of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merge-re
c
ur
s
i
v
e: Avoid doubly me
r
ging rename/
a
d
d conflict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
El
i
jah Ne
w
r
e
n
me
r
ge
-
re
c
u
r
siv
e
: Upda
t
e me
r
ge_content() call signature
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merge-re
c
ur
s
ive: Upd
a
te
conflict_rename_rename_1to
2
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merge-re
c
urs
i
ve: Structure pro
c
ess_df_
e
nt
r
y(
)
to handle
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elija
h
Newren
merge-
r
ecursive: Have process
_
e
n
try() s
k
ip
D
/F or rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
m
erg
e
-
recu
r
sive: N
e
w function to
a
ssist resolvi
n
g renames
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newr
e
n
merge-recurs
i
ve: New data structures for defer
r
ing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newre
n
merge-recursive:
M
ove
pr
o
cess_entry's co
n
tent merging
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
lija
h
Newre
n
me
r
ge-recurs
i
ve: Move
d
elete/modify
handling i
n
t
o dedicated
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merge-recursive: Move
r
ename/de
l
et
e
handlin
g
i
nto dedica
t
ed
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merge-recursive: Nu
k
e rename/direc
t
or
y
conflict
detecti
o
n
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
El
i
jah Newren
mer
g
e-r
e
cu
r
sive: Rename conflict_rename
_
rename*() for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merge-re
c
u
r
sive: Small code clarification
-
- variable
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah
N
ewren
t6036: Add testcas
e
f
or undete
c
te
d
co
n
flict
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah
Ne
w
ren
t6036: Add a
second testcase simi
l
ar
to the fi
r
st
but
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
l
ijah Newren
t6036: Test index and w
o
rktre
e
state, not
just that
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
t6020:
Add a testcas
e
for modif
y
/d
e
let
e
+ directory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
l
i
j
ah Newr
e
n
t
6020
:
Modernize s
t
yle a
bit
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Eli
j
ah Ne
w
r
en
t6022:
A
d
d tests for re
n
ame/rename c
o
mbined wi
t
h D
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
t6022: A
d
d
p
aired ren
a
me+D/F c
o
n
flict: (two/file,
o
ne
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
t
6
022: Ad
d
t
e
sts with b
o
th rename source & dest involved
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
t6022: Add tests for r
e
versin
g
or
d
e
r
o
f
merges whe
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
l
ijah New
r
en
t6022: Add test combinations of {content c
o
nflic
t
?
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
t6032:
Add a tes
t
checking for
e
xcessive ou
t
put from
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-10
Elijah
N
ewren
merge-recursive: D/F conflicts where was_a_dir/file
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-10
Eli
j
ah Newren
t
3
509: Add
rename + D
/
F
conf
l
ict testcase
that
r
e
cursive
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-07
Elijah Newren
revert: Fix trivial c
o
mment sty
l
e issue
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-07
Eli
j
ah
Newr
e
n
c
a
che_tree
_
fre
e
: Fix small memory leak
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-25
Elijah
Newren
tree-walk:
C
orrect bitrotted comment about tree_entry()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-20
Elija
h
Newren
merge-r
e
c
u
rsive
:
A
void excessive output
f
or an
d
reproces
s
ing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Elija
h
Newren
m
e
rge-
r
ecursive: Fix multiple fil
e
rename
across D
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Elijah Newr
e
n
t
6
031: Add
a
testcase covering multiple re
n
ames ac
r
os
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Elijah Newren
mer
g
e-
r
e
c
ursi
v
e
: Fix typo
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-13
Elijah Newren
M
a
rk tests tha
t
use symli
n
ks
a
s
n
eeding SYML
I
NKS prerequisite
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-13
Elijah Ne
w
ren
pull --reba
s
e: Avoid s
p
urious conflicts and reapplyin
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-13
Elij
a
h
Newren
t5520-
p
ul
l
:
Add testcases showing spu
r
ious conflicts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-02
Elijah
N
ewren
u
p
load-pack: Improve
error m
e
ssage when
bad ref re
q
uested
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
Elijah Newren
fast-export: Add a --full-tree opti
o
n
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
Elijah
N
ewren
fast-export: Fix dropping o
f
fi
l
es with --impor
t
-mar
k
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-09
Elij
a
h
N
ew
r
en
fast-import: Im
p
rov
e
robustness whe
n
D
-
>F chan
g
es provided
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-09
E
l
ijah Ne
w
ren
fast-export: Fi
x
output ord
e
r
of
D/F changes
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-09
Elijah N
e
wren
m
e
rge_recursive: Fi
x
rena
m
es across paths be
l
ow D/F
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-09
El
i
jah Newr
e
n
merge
-
r
e
c
u
r
sive: Fix D/F con
f
li
c
ts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-09
Elijah Newren
A
d
d
addit
i
o
nal testcases f
o
r
D/F c
o
nflicts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
Eli
j
ah N
e
wren
fast-export: D
o
cument the fact that git
-
r
ev-l
i
st arg
u
m
e
nts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
Elijah Newren
Add
n
ew fast-export testcases
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
Eli
j
a
h
Newren
fast-export: Add a --tag-o
f
-fil
t
e
r
ed
-
o
b
j
e
c
t option
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
E
l
i
jah Newren
fast-export: Do p
a
rent
rewriting to
a
void
d
r
oppi
n
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
Elijah Newren
f
ast-export:
M
ake sure we
show
ac
t
ual ref
names in
s
tead
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
Elijah Newren
f
ast-ex
p
ort: Omit
t
ags t
h
at tag
t
rees
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
E
l
ijah
Newren
fa
s
t-exp
o
rt: Set revs
.
topo_order
b
efo
r
e calli
n
g setup
_
r
e
visions
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-05-16
E
lijah Newre
n
g
i
tk: M
a
ke m
o
r
e
opt
i
o
ns ea
s
ily
a
ccessib
l
e from Edit
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-03-26
Elijah Newren
fast-expo
r
t: Avoid dropping files fro
m
commits
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-03-25
El
i
j
a
h N
e
wr
e
n
Corre
c
t missing
S
P
characters in grammar comment at
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-03-25
Eli
j
a
h Newren
git-filter
-
branc
h
: avoid
collisions with variables
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-02-28
Elijah Newr
e
n
E
n
sure proper s
e
t
u
p of git_dir
f
or
git-
h
a
sh-o
b
ject
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-02-12
Elij
a
h
Newre
n
f
ast-export: ensure we
t
raverse commits in top
o
logical
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree