repo.or.cz
/
git
/
git-svn.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
[PA
T
C
H
] Use a tempo
r
ary
i
n
dex file when we merge the
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
r
edrik Kuivinen
[PATCH] Adj
u
st g
i
t-merge-recursive
.
py for
t
he n
e
w tool
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
r
edr
i
k Kuivinen
[PATCH] Do
n
't output
'Au
t
omati
c
merge failed,
.
.
.
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fred
r
ik Kuivinen
[PATCH] Be more like the 'r
e
solve
'
strategy
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
redri
k
Kuivin
e
n
[PATCH]
Ren
a
me t
h
e 'fr
e
drik
'
merge strategy to 're
c
ursive
'
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[PAT
C
H] Make the ProgramError class printa
b
le
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredr
i
k Ku
i
vinen
[PATCH] Make sure we die
i
f we
d
o
n't ge
t
e
n
ough argument
s
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredr
i
k
K
ui
v
inen
[
P
ATCH] Intro
d
uce a 'die' function
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredr
i
k
Kuiv
i
nen
[
P
A
T
CH] Exit with status cod
e
2 if we get
an exception
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[PATCH] Fix asse
r
t
ion
failure
wh
e
n
m
erging common ancestors
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-04
Fred
r
ik Kuivinen
[PATCH
]
M
a
k
e gi
t
-app
l
y unde
r
stand inc
o
mpl
e
te
l
ines
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree