repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Arrgh -- another asciidoc caret workaround.
2005-09-13
Fredrik Ku
i
vi
n
en
[
P
ATCH]
U
s
e
the
'die' fun
c
tion where it is appropriate
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuiv
i
n
e
n
[P
A
TCH] U
s
e a temp
o
rary index file when we
merge th
e
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fre
d
rik
K
uivin
e
n
[PATCH] Adjust git-mer
g
e-recursive
.
py
f
or
t
he
n
ew tool
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik K
u
ivinen
[
P
ATCH] Don
'
t ou
t
put 'Automati
c
merge
faile
d
,
.
.
.
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[P
A
TCH] Be more
l
ike the 'resolve' s
t
r
a
tegy
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[
P
ATCH
]
R
ename t
h
e 'fredrik' me
r
ge s
t
rate
g
y to
'
recursiv
e
'
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
F
r
edrik Kuivinen
[PATC
H
] Make
t
he Pro
g
ra
m
Erro
r
class printable
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[PATC
H
] Make sure we die if we don't
get enou
g
h
a
r
guments
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
F
redrik Kuiv
i
nen
[P
A
TCH] Intr
o
duce a 'd
i
e' function
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik K
u
i
v
i
nen
[PATC
H
] Exit with status code 2 if we g
e
t an
e
xcep
t
i
o
n
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Ku
i
vin
e
n
[PATC
H
]
Fix assertion fai
l
ure when merging c
o
mm
o
n ancestors
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-04
Fredrik Kuivinen
[PATCH
]
Mak
e
g
i
t-apply u
n
d
erstand inc
o
mplete lines
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree