repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
t6036: Add testcase for undetected conflict
2010-09-30
Elijah Newren
t6036: Add
te
s
t
c
a
s
e for undetected confl
i
ct
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-30
E
li
j
ah N
e
wr
e
n
t6
0
36: A
d
d a seco
n
d testcase similar t
o
t
h
e fir
s
t bu
t
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-30
E
l
ijah Newr
e
n
t6036: Test index and worktree
s
t
a
te
,
not just that
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
t6020
:
A
d
d a testcase for modify/delete + directory
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-30
Elij
a
h Newren
t602
0
:
M
odernize
style a
bit
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-30
El
i
jah Newren
t6022: Add tests f
o
r
renam
e
/rename co
m
bined with
D
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-30
Elijah New
r
en
t
6
02
2
: Ad
d
pai
r
ed rename
+
D/F confli
c
t: (t
w
o/fil
e
, one
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-30
Elija
h
Newren
t6022: Add test
s
with both renam
e
source &
de
s
t involve
d
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-30
Elija
h
Newren
t
6
022: A
d
d tests for revers
i
ng
o
rde
r
o
f merges
when
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
t6022: Add test combinations of {content conflict?
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
t
6032: Add a
test
checki
n
g
for ex
c
essive ou
t
put from
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-10
Eli
j
ah Newren
m
erg
e
-re
c
ursive: D/F
conflicts
w
here wa
s
_a_dir/file
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-10
Elija
h
Newren
t3509
:
Add
rename + D/F
c
onf
l
ict tes
t
ca
s
e that recursive
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-07
El
i
ja
h
Newren
r
e
vert: F
i
x triv
i
al co
m
ment style issue
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-07
Elijah Newren
cache_tree_free: Fix smal
l
memor
y
l
e
ak
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-25
Elijah N
e
wren
tree
-
walk: Co
r
re
c
t bitrott
e
d comm
e
n
t
about tree_entry()
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-20
Elijah Newren
m
e
r
ge-r
e
cursive: Avoid excessi
v
e output for a
n
d reprocessing
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Elijah Newren
merge-r
e
cur
s
ive:
Fix multiple
f
ile
ren
a
m
e acros
s
D
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Elijah Newren
t
60
3
1: Add a testcase covering multiple
re
n
am
e
s ac
r
oss
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
E
lija
h
Newren
merg
e
-
r
ecursiv
e
:
F
i
x
typo
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-13
E
lijah Newren
Mark tests t
h
at
use symlin
k
s
a
s
needing SYMLINKS pre
r
equ
i
site
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-13
El
i
jah Newren
pull
--re
b
ase:
Avoid spuri
o
us conflicts and re
a
pplyi
n
g
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-13
Elijah Newre
n
t5520-
p
ull: Add testcases s
h
owing s
p
u
r
ious
c
onflict
s
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-02
E
l
ijah Ne
w
ren
u
p
load-pa
c
k:
Im
p
ro
v
e er
r
or message when b
a
d ref requeste
d
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-19
Eli
j
ah
N
ewren
fast-export: Add a --full-
t
ree optio
n
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-19
El
i
ja
h
N
e
w
r
e
n
fast-
e
xport: Fix dro
p
ping of files
w
ith --import-marks
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-09
Elijah
Ne
w
ren
f
a
s
t
-
i
mpor
t
:
I
m
p
rove robus
t
n
e
ss wh
e
n
D
->F changes
p
rovided
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-09
Elijah N
e
wren
fa
s
t-e
x
port: Fix output orde
r
of D/F
changes
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-09
Elijah N
e
wren
me
r
ge_recursi
v
e:
Fix
r
e
n
ames across
p
aths below D/F
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-09
Elijah Newren
me
r
ge-recursive: Fix
D/F confli
c
ts
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-09
Elijah
Newren
Add
additional testcases for
D
/
F
confli
c
t
s
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-27
Elijah Newren
fas
t
-export: D
o
c
u
m
e
nt the
f
act that gi
t
-rev-list arguments
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-27
El
i
j
a
h Newre
n
Add new fast-export t
e
stca
s
e
s
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-27
Elijah Newre
n
fast-export
:
Add a --tag-of-f
i
lte
r
ed-object option
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-27
Elijah Newren
fast
-
export: Do parent rew
r
it
i
ng to avoid
d
r
o
pping
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-27
Elij
a
h
N
ewren
fast-export:
M
a
k
e
s
ure w
e
show
a
ctual ref na
m
e
s
inst
e
a
d
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-27
E
l
ijah Newren
fas
t
-export
:
Omi
t
tags that tag t
r
ees
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-27
El
i
jah N
e
wren
f
ast-export
:
Se
t
revs
.
topo_order before calling setup_revi
s
ions
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-16
Elijah Newren
gitk: Make more opt
i
on
s
easily
a
c
c
e
ssible from Edit
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-26
Eli
j
a
h Newren
fast-export: Avoid dropping f
i
les from commit
s
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-25
Elijah Newren
C
o
r
rect missin
g
SP characters in grammar comme
n
t a
t
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-25
E
lijah Ne
w
ren
g
i
t
-filter-bra
n
ch:
av
o
id collisions with var
i
ables
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2009-02-28
E
l
ijah
N
ewren
Ensu
r
e proper
s
e
tup of g
i
t
_
dir fo
r
git-hash-object
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2009-02-12
Elijah New
r
en
fast-expo
r
t
:
ensure we trave
r
se commits in
t
opologica
l
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree