repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Revert "Make Octopus merge message a bit nicer."
2005-09-13
Fre
d
rik Kuivinen
[P
A
T
C
H] Use the 'die'
f
unction
wh
e
re it is app
r
opri
a
te
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredri
k
K
u
ivinen
[PA
T
CH] Use a tempo
r
ary index file when we me
r
ge the
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik
K
uivine
n
[PAT
C
H] Ad
j
ust git-
m
erge-re
c
ursi
v
e
.
py for the n
e
w to
o
l
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik K
u
i
vinen
[PATCH
]
Don't output 'Auto
m
ati
c
m
erge fail
e
d,
.
.
.
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivi
n
e
n
[PATC
H
] Be more like t
h
e
'resolve' strategy
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fre
d
rik
Kuivinen
[PATCH] Rename th
e
'f
r
edrik
'
merge s
t
rategy to 're
c
ursive'
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Ku
i
vinen
[P
A
TCH] Mak
e
the Pr
o
gra
m
Error clas
s
printa
b
le
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kui
v
inen
[P
A
TCH] Make sure we die if we do
n
't get enough argum
e
nts
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik
K
u
i
vi
n
en
[PATC
H
]
Introduce a
'
d
i
e
'
f
unc
t
ion
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[PATCH] Exit with s
t
atus co
d
e
2 i
f
we get an
exce
p
ti
o
n
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
F
redrik K
u
ivinen
[PATCH] F
i
x assertion failure w
h
en merging comm
o
n
an
c
estors
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-04
Fre
d
r
i
k Kuivine
n
[PAT
C
H] Make git-apply un
d
erstand
i
ncomplete
l
i
n
e
s
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree