repo.or.cz
/
alt-git.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 Kuivinen
[PAT
C
H]
Use
a
tem
p
orary index file when we m
e
rge
the
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik
Kuivinen
[PATCH] Ad
j
ust git-merge-rec
u
rsive
.
py for the ne
w
to
o
l
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fr
e
drik Kuivinen
[PATCH]
D
on't out
p
ut 'Automat
i
c merge failed,
.
.
.
'
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fredr
i
k
Kuivinen
[PATCH] Be mo
r
e l
i
ke
th
e
'resolve' strategy
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivi
n
e
n
[PA
T
CH] Rename the 'fred
r
i
k'
m
erge strategy
t
o
'recursive'
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
F
re
d
r
i
k Kuivinen
[
PATCH] Make the ProgramError cl
a
ss printable
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[PATC
H
] Make sure we
di
e
i
f
we don't get enough arg
u
ments
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
F
redrik Ku
i
vi
n
e
n
[
PATCH] Intro
d
uce
a
'die' fu
n
c
ti
o
n
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[PATCH] Exit with
s
tatus code 2 if
we get an exception
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
F
r
edri
k
Kuiv
i
nen
[PA
T
CH] Fix assertion f
a
ilure whe
n
m
e
rging common a
n
cesto
r
s
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-04
Fredrik Kui
v
inen
[PATCH]
M
ake git-apply understand incomplete lines
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree