repo.or.cz
/
git
/
debian.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
[PATCH] Use a temporary index file when we merge the common ancestors.
2005-09-13
Fredrik
K
uivinen
[PATCH] Use
a
t
e
mpor
a
ry index file w
h
en we merge
t
he
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[PATCH] Adj
u
st gi
t
-m
e
rge-
r
ecu
r
s
ive
.
py for
t
he new
too
l
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fredri
k
Kuivinen
[PATCH] D
o
n't o
u
tput 'Aut
o
matic merge failed,
.
.
.
'
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
F
r
edrik Kuivinen
[
P
ATCH] Be more li
k
e the 'r
e
solve' stra
t
egy
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[PATC
H
]
Renam
e
the '
f
redrik'
merge strategy to 'recursive'
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
F
r
e
d
r
i
k Kuivinen
[P
A
T
CH] Make t
h
e ProgramErr
o
r class printable
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
Fre
d
rik Kuivinen
[PATCH] Mak
e
sure we di
e
if we don't get enough arg
u
ments
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
Fredri
k
Kuivinen
[P
A
TCH] Introdu
c
e a 'die' f
u
nction
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[PATCH] E
x
i
t with status code
2
if we get an exce
p
tion
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
F
r
edrik
K
u
ivinen
[PATCH
]
Fix assertion f
a
ilu
r
e when merging comm
o
n ancesto
r
s
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-04
F
redrik
K
ui
v
inen
[PATCH]
M
ak
e
git-apply
u
nder
s
t
and incomple
t
e lines
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree