repo.or.cz
/
git
/
git-svn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dir
2010-09-10
Eli
j
ah
Newren
merg
e
-
r
ecursive: D/F conf
l
ict
s
where was_a_dir/file
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-10
E
l
ij
a
h Newren
t3509: Add rename + D/F conflict
t
estcase that recursive
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-07
Elijah Newr
e
n
re
v
ert: Fix triv
i
al c
o
mment s
t
y
l
e issue
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-07
E
l
i
jah Newren
c
ache_tree
_
f
ree
:
Fix s
m
all memory leak
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-25
E
lija
h
New
r
en
t
ree-walk
:
Correct
b
itrotted comment abo
u
t tree_ent
r
y()
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-20
Elij
a
h New
r
en
merge-re
c
ursive: Avoi
d
e
xcessive outpu
t
for
and reproce
s
sing
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Elijah Newren
merge-recur
s
ive: Fix multip
l
e file
r
e
name acr
o
ss D
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Elijah
Newren
t6031: Add a testcase cov
e
rin
g
m
u
l
tipl
e
r
enam
e
s ac
r
oss
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
El
i
jah
Newr
e
n
merge-recursive: Fix
t
ypo
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-13
Elij
a
h
N
ewren
Mar
k
tes
t
s t
h
at use symlinks
as nee
d
ing SYMLINKS
prerequisite
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-13
Elijah Newren
pu
l
l -
-
rebase: A
v
oid spuriou
s
conflicts and reappl
y
ing
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-13
E
l
ija
h
Newren
t5520-pul
l
: Add test
c
ases showing
spu
r
ious conflicts
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-02
E
l
ij
a
h Newren
u
p
load-pack: Improve
error message whe
n
bad re
f
r
e
quested
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-19
Elijah Newren
f
a
st-ex
p
or
t
:
Add a
--full-
t
ree
o
ption
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-19
E
l
ijah Newren
fast-export:
F
i
x dropping o
f
files w
i
th --
i
mport-marks
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-09
E
l
ijah Newren
fast-import: Imp
r
o
ve rob
u
stn
e
s
s
when D->F chan
g
es pro
v
ided
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-09
Elijah Ne
w
ren
f
a
s
t-export: F
i
x output order of D/
F
c
h
anges
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-09
Elijah Newren
m
erge
_
recursive: Fix renames across
p
aths
b
e
low
D
/
F
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-09
E
lij
a
h Ne
w
ren
merge
-
recursive: Fix D/F conflicts
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-09
Elija
h
Ne
w
ren
Add ad
d
itio
n
al testcases for D/F conflicts
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-27
El
i
jah Newr
e
n
fast-export: D
o
cumen
t
the fact that git-
r
ev
-
list arg
u
ments
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-27
Elijah Newren
Add
n
e
w fast-export testcase
s
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-27
Elijah Newren
fast-
e
xp
o
rt: Add a --ta
g
-of-filtered-o
b
jec
t
opt
i
on
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-27
E
l
ijah Newren
fast-ex
p
ort: Do parent
r
ew
r
itin
g
to avoid dr
o
p
p
in
g
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-27
E
l
ij
a
h Newr
e
n
fast-expor
t
: Ma
k
e s
u
re we show actual ref names inst
e
ad
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-27
Elijah Newren
fast-e
x
p
o
rt: O
m
it tags
tha
t
tag trees
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-27
E
l
ijah
N
ewren
fast-export: Se
t
rev
s
.
t
opo_order b
e
fore ca
l
l
ing setup_revisions
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-16
E
l
ijah New
r
en
gitk: Make mo
r
e
o
p
tions easily access
i
ble from Edit
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-26
Elijah Newr
e
n
fas
t
-e
x
port: Avoid d
r
opping files f
r
o
m c
o
mmit
s
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-25
Elijah
Newren
C
orrect missing SP ch
a
r
a
cters in grammar comment at
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-25
Elij
a
h Newren
git-filter-br
a
nch: avoid collisions with variables
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2009-02-28
Elija
h
Newren
Ensure pro
p
er setup of git_dir for
g
i
t
-hash-ob
j
ect
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2009-02-12
Elijah
Newren
fast-export: ensure we trav
e
rse commi
t
s
in
topological
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree