repo.or.cz
/
debian-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
read-tree: remove --head option.
2005-09-25
Fredr
i
k Kuivine
n
[PATCH]
M
o
re de
s
cri
p
tive
m
essages
f
o
r
conflict cases
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredri
k
Kui
v
inen
[PATCH] recursi
v
e-merge: Don'
t
p
rint a stack trace
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
r
edrik
K
uivinen
[PATCH] Use th
e
'die' function where it is
app
r
opriat
e
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik
K
uivinen
[PATCH] Use a temporary index f
i
le when we
m
erge th
e
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredr
i
k Kuivinen
[P
A
TCH]
Adjust gi
t
-mer
g
e-recursive
.
p
y
f
or t
h
e new too
l
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fre
d
rik Kuivinen
[
P
ATCH] Don't o
u
tput 'Automatic mer
g
e failed,
.
.
.
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fr
e
drik
K
uivinen
[PATCH] Be
m
o
re like the 'resolve' st
r
a
t
e
g
y
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
r
e
drik Kuivinen
[PATC
H
] Rename
t
he 'fredrik' mer
g
e s
t
rat
e
gy to '
r
ecu
r
sive'
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
F
r
edri
k
Kuivinen
[PATCH] Ma
k
e th
e
ProgramError c
l
ass printab
l
e
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[PATCH
]
Make sure
we die if we don't get
e
nough ar
g
uments
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik
K
uivin
e
n
[
P
ATCH] Intr
o
duce a 'die' function
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik
Kuivinen
[PATCH]
E
x
it wi
t
h
status cod
e
2 if
w
e get an e
x
ception
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kui
v
inen
[
P
A
T
C
H] Fix assertion
fai
l
ure when merging common ances
t
ors
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-04
Fr
e
d
rik Kuivinen
[PA
T
CH] Ma
k
e
g
i
t
-apply unde
r
stand incomplete lin
e
s
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree