repo.or.cz
/
git
/
git-svn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Still installing the old command names.
2005-09-25
Fre
d
r
i
k Kui
v
inen
[PATCH] More descrip
t
i
ve mes
s
age
s
for c
o
nf
l
ic
t
cases
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
F
redrik Ku
i
v
inen
[P
A
T
C
H
]
recursive-merge:
Don't p
r
int a stack trace
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
r
edrik Kuivinen
[PATCH] Use th
e
'die' function wher
e
i
t is appro
p
riate
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fr
e
d
rik
Kuivinen
[PATCH] Us
e
a
tem
p
orary in
d
ex
f
ile
w
hen we me
r
ge the
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[PATCH] Adjust gi
t
-m
e
rge-recu
r
sive
.
py for the new tool
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
re
d
r
i
k
Kui
v
inen
[PA
T
CH]
Don't output
'
Automatic
m
erge fail
e
d,
.
.
.
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[P
A
TCH] Be
m
ore like the
'
resolve' strat
e
g
y
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[PATCH
]
Renam
e
t
h
e 'fredr
i
k' mer
g
e st
r
ategy
to 'recursi
v
e'
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
F
r
edrik Kuivinen
[PATCH
]
Make the P
r
ogramError
c
lass printable
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredri
k
K
u
ivinen
[PATCH] Make sure
w
e di
e
i
f
we don't
get en
o
ugh arguments
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik
K
u
ivi
n
en
[
P
ATC
H
] Introduce a 'die'
function
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivin
e
n
[PATCH] Exit with status code
2
if w
e
get an ex
c
ept
i
on
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivi
n
en
[PATCH
]
Fix asser
t
i
o
n failure when mergin
g
common ancestors
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-04
Fredrik Kuiv
i
nen
[PATCH] Ma
k
e
git-
a
pply
understand i
n
comp
l
ete
l
ines
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree