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] More descriptive messages for conflict cases in merges
2005-09-25
Fre
d
r
i
k K
u
i
vinen
[
P
A
T
CH] More d
e
scriptive messa
g
e
s for conflict cases
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik
K
u
i
vinen
[PATCH]
r
ecursive
-
me
r
ge: Do
n
't pr
i
nt
a stack trace
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
F
r
e
d
r
i
k
K
uiv
i
nen
[PATCH] Use the
'
die'
f
unction w
h
ere it is app
r
op
r
iate
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fred
r
ik
K
uivin
e
n
[PATCH] Use a temporary index file
wh
e
n we merge
the
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fr
e
d
rik K
u
ivinen
[PA
T
CH]
A
djust git
-
merge-recursive
.
p
y
for
the new tool
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[PATCH] Don'
t
output 'A
u
tomat
i
c merge fa
i
led,
.
.
.
'
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fr
e
drik Kuivin
e
n
[PATCH] Be more like
the 'res
o
lve' strate
g
y
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[PATCH] R
e
name the 'fred
r
ik'
m
e
r
g
e strat
e
gy to
'
recurs
i
ve'
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[PATCH]
M
ake
t
he ProgramError class print
a
ble
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik
K
uivinen
[PATCH] Make su
r
e we die
if we do
n
'
t get enough argum
e
n
ts
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik K
u
ivinen
[PATCH] Int
r
oduce a 'die' function
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
F
r
edrik K
u
i
vinen
[
PATCH] Exi
t
w
i
t
h status code 2 if we
get an e
x
ception
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
Fredr
i
k Ku
i
vinen
[P
A
TCH] Fix as
s
ertion f
a
ilure when merging c
o
mmon ancesto
r
s
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-04
F
r
ed
r
ik
K
uivinen
[PA
T
CH
]
Ma
k
e g
i
t-ap
p
ly
u
n
d
e
rstand
inc
o
mpl
e
te
l
i
n
es
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree