repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'fixes'
2005-09-13
Fredrik Kui
v
i
n
en
[PATCH]
Use the 'die' function
where it is
a
p
propriate
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kui
v
in
e
n
[PATCH]
U
se a te
m
porary in
d
ex
file when we merge t
h
e
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredri
k
Kui
v
inen
[PATCH] Adjust
git-
m
erge-re
c
ursive
.
p
y for the ne
w
tool
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredri
k
Kuiv
i
nen
[PATCH] Don't
o
utput
'
Automat
i
c
m
erge failed,
.
.
.
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
redrik Ku
i
vinen
[PATC
H
]
B
e more like the 'resolve'
s
tra
t
egy
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
r
edrik
K
uivinen
[P
A
TCH]
R
ename the 'fredrik'
merge s
t
rategy
t
o '
r
ecursive'
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredri
k
Kuivinen
[PATCH] M
a
ke the ProgramE
r
ror class printable
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
F
redrik K
u
ivinen
[PA
T
CH] Make sur
e
we die if we don't get enough
arguments
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredri
k
K
uivin
e
n
[P
A
TCH] Intro
d
uce
a '
d
ie' fu
n
ction
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik
K
uivin
e
n
[PATCH] Exit w
i
t
h
status
c
o
d
e
2
if
w
e get a
n
exception
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
F
r
e
drik
K
uivinen
[
PATCH]
Fix a
s
s
e
rtion failure when
m
erging
c
ommon ancestors
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-04
Fredrik Kuivi
n
en
[PA
T
C
H] Ma
k
e
git-apply under
s
tand incomplete lines
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree