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
Give default merge message after failed automerge.
2005-09-25
Fre
d
rik Kuivinen
[
PATCH] More
descriptive mes
s
ages for con
f
lict cases
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik
K
uivi
n
e
n
[PATCH]
r
e
c
u
r
sive
-
merge:
D
on't p
r
int a stack trace
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivi
n
en
[PATCH] U
s
e the 'die'
function
where it is
appropriate
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fre
d
rik K
u
i
v
i
n
en
[PA
T
CH] Us
e
a
t
e
m
porary index file w
h
en we merge the
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik K
u
ivinen
[PATC
H
] Adjust git-merge-recursive
.
py for the
n
ew tool
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fre
d
rik Kuivinen
[PATCH] Don't o
u
tp
u
t 'A
u
tom
a
t
i
c
mer
g
e failed,
.
.
.
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fred
r
ik Kuivin
e
n
[
P
ATCH] Be more lik
e
the
'resolve' strategy
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik
Kuivinen
[PAT
C
H]
Renam
e
the 'fre
d
r
ik'
merge str
a
t
e
gy to 'recursive'
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fr
e
drik K
u
ivi
n
en
[PAT
C
H] Make
the ProgramError class
p
rinta
b
le
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredr
i
k Kui
v
in
e
n
[PATCH
]
Mak
e
sure we die if we don't get enough arg
u
ments
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[
PATCH]
I
ntroduce a
'
die' f
u
nction
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fre
d
rik
K
uivinen
[PATC
H
] Exit with status co
d
e 2 if
we
get an exceptio
n
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fr
e
dri
k
Kui
v
in
e
n
[
P
ATC
H
] Fix assertion failure
wh
e
n me
r
ging
c
ommon ancesto
r
s
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-04
Fr
e
drik
Kuivine
n
[
P
ATCH] Ma
k
e git-apply understand incomplete lines
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree