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
New test case: Criss-cross merge
2005-12-03
Fredrik Kuiv
i
nen
New
test case: Criss-cross merge
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Kuivinen
New test case
:
merge with directory/
f
i
l
e
co
n
f
l
icts
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-12-03
Fredr
i
k
Kuivinen
test-
l
ib
.
sh: Add new funct
i
on, test_ex
p
ect_co
d
e
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik
K
uivinen
git-merge
:
Exit wit
h
code
2
if no strategy was ab
l
e
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-11-20
Fredrik Kuivinen
merge-rec
u
rsive: Replace 'ex
c
e
pt:'
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik K
u
i
v
inen
mer
g
e
-
recursive: Use '~' instea
d
of '_' t
o
s
e
para
t
e
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik Kuivinen
m
erge-
r
ecursive: Add copyright notice
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-11-12
Fre
d
rik K
u
ivinen
merge-recur
s
i
v
e: Indent the output properly
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-11-09
Fredrik
K
uivin
e
n
merge-recursive: Fix support for branch names
containing
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-11-09
Fredrik Kuivi
n
en
merge-recu
r
si
v
e: Fix li
m
ited output of rename messages
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-11-08
Fr
e
drik Kuivinen
m
erge-recursive: Only pr
i
nt relevant rename messages
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-10-03
Fredrik
K
uivinen
[PAT
C
H] Enable
a
nd fi
x
support f
o
r base less merges
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik Kuivinen
[
PA
T
CH] Teach git-ls-f
i
les abou
t
'
-
-
' to denote end
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik Kuivine
n
[PATCH] Teach the
r
e
c
ursi
v
e
merge
strateg
y
abou
t
rena
m
es
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-25
F
r
e
d
ri
k
Kuivinen
[PA
T
CH] More descripti
v
e message
s
f
o
r
c
onflict cases
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-25
F
re
d
r
ik
K
uivine
n
[PATCH] recursi
v
e-merge: Don't print a stack
trac
e
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik K
u
i
vinen
[PATCH] Use the '
d
ie' function whe
r
e
i
t is appropriat
e
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fredr
i
k Kuivine
n
[PATCH] U
s
e a temporary inde
x
fi
l
e
when we merg
e
th
e
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Ku
i
v
i
n
en
[PA
T
CH]
Adjust git-merge-rec
u
rsive
.
py for the new tool
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fred
r
ik Kuivinen
[PATCH] Don't outp
u
t 'Automatic merge f
a
iled,
.
.
.
'
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivine
n
[PATC
H
] Be more like the 'resolve' strat
e
gy
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fre
d
rik
Kuivi
n
e
n
[PATCH
]
Rename the 'fredrik' merg
e
s
t
rategy to 'recursive'
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
F
redrik Kuiv
i
nen
[PATCH] Make the
Progr
a
mError cl
a
ss printa
b
le
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
Fredr
i
k Kuivine
n
[PATCH] Make sure we die if we
d
on't g
e
t
enough
a
rgument
s
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[PATCH] Introduce
a 'die' fun
c
tion
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
Fr
e
drik Kuiv
i
nen
[PATCH]
Exit with
status c
o
de 2 if
we get an excep
t
i
o
n
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
F
redrik Kuivi
n
en
[P
A
TCH] Fix a
s
sertion failu
r
e when me
r
ging
c
ommon ancest
o
rs
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-04
Fredrik Kuiv
i
nen
[PATCH
]
Ma
k
e
g
it-apply understand in
c
omplete lines
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree