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] Use a temporary index file when we merge the common ancestors.
2005-09-13
Fredrik Kuivinen
[PATCH]
U
se 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
Fredrik Ku
i
v
i
nen
[
P
ATCH]
Adjust git-merge-re
c
ursive
.
p
y
for the
n
ew tool
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fred
r
ik Kuivinen
[P
A
TCH] Don't o
u
t
put 'Aut
o
mat
i
c m
e
rge fai
l
ed,
.
.
.
'
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Ku
i
vine
n
[
P
AT
C
H] Be more
l
ike t
h
e
'
r
esolve'
strategy
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[PATCH] Renam
e
th
e
'fredrik' merge str
a
t
egy
t
o 'recursiv
e
'
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik
K
uiv
i
nen
[PAT
C
H] Make
t
he ProgramError
c
la
s
s
p
r
in
t
able
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
Fredri
k
Kuivinen
[PATCH] Make sure w
e
die if
w
e don't g
e
t
eno
u
gh ar
g
ume
n
ts
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
F
redrik Kui
v
inen
[PATC
H
]
Intr
o
duce a 'die'
func
t
i
on
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
Fr
e
drik K
u
ivinen
[PATCH] Exit with st
a
tus co
d
e 2 if we get an except
i
on
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Ku
i
vinen
[PATCH] Fix assertion f
a
ilu
r
e when merging
common ances
t
ors
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-04
Fredrik
Ku
i
v
inen
[PATC
H
] M
a
ke git-app
l
y unders
t
and incomplete lines
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree