repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
[PATCH] Don't output 'Automatic merge failed, ...'
2005-09-13
Fredr
i
k
Kuivinen
[PATCH] Don't outp
u
t '
A
ut
o
matic me
r
ge failed,
.
.
.
'
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
F
redrik
K
u
i
vinen
[PATCH] Be more li
k
e
the 'resolve' stra
t
egy
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fr
e
dri
k
Kuivin
e
n
[PATCH] Rename the
'fre
d
rik' m
e
rge
s
trateg
y
to 'recu
r
sive
'
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
F
r
edrik Kuivinen
[PAT
C
H]
M
ak
e
the ProgramError cla
s
s p
r
i
n
table
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
Fredri
k
Kuivin
e
n
[PATCH] Make sure
w
e
die if we
d
on't get eno
u
gh arg
u
ments
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
Fredri
k
Kuivin
e
n
[PAT
C
H
] I
n
troduce a 'die' function
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
Fre
d
rik K
u
ivi
n
en
[PAT
C
H] Exit with stat
u
s co
d
e 2 if we get an exc
e
p
t
i
o
n
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Ku
i
v
inen
[PATCH]
Fix
a
ssertion
f
ailu
r
e
whe
n
merging common a
n
cestors
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-04
Fredrik Kuivinen
[PATC
H
] Make git-apply underst
a
n
d i
n
comp
l
ete lines
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree