repo.or.cz
/
git
/
repo.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
[PATCH] Teach the recursive merge strategy about renames.
2005-10-02
Fredrik Kuivinen
[PATCH] Teach
t
he recur
s
ive merge
s
trat
e
gy about re
n
ames
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik Kuiv
i
nen
[P
A
TCH]
M
ore descriptive mes
s
ages for conflict
cases
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik Kuivin
e
n
[PATCH]
r
ecursiv
e
-me
r
ge:
D
on't pr
i
n
t a s
t
ack
t
race
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuiv
i
nen
[PATCH] Use the 'die' function
w
here it
is approp
r
i
a
te
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[PATCH] Us
e
a tem
p
orary index file when we merge the
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
F
redrik Ku
i
vinen
[PAT
C
H
] Adj
u
st gi
t
-merge-recursive
.
py for t
h
e new tool
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fred
r
ik
Ku
i
vinen
[PATCH] Don't outp
u
t 'Automatic m
e
rge failed,
.
.
.
'
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[P
A
T
CH] Be m
o
re like
the
'resolve
'
strat
e
gy
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fre
d
rik Ku
i
vinen
[PA
T
C
H
]
R
ename
t
he 'fredr
i
k' merge stra
t
egy to 'recu
r
sive
'
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
Fr
e
dr
i
k Kui
v
inen
[
PATCH] M
a
ke the ProgramEr
r
or class printable
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivi
n
en
[
PATCH] Make s
u
re we die if we don't get enou
g
h arg
u
m
ents
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
Fred
r
ik Kuivi
n
en
[PATCH] Introdu
c
e a 'die' funct
i
o
n
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
F
r
edrik Kuivinen
[PATCH] E
x
it wi
t
h st
a
tu
s
code 2
if w
e
get an exc
e
ption
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Ku
i
vinen
[P
A
TCH] Fix a
s
sertion failure w
h
e
n mer
g
in
g
c
o
mmon ance
s
tors
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-04
Fr
e
drik K
u
ivinen
[P
A
T
C
H
] Ma
k
e git-a
p
ply understan
d
incomplete
l
ines
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree