repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
[PATCH] Enable and fix support for base less merges.
2005-10-03
Fredrik
K
uivine
n
[PATCH] Enable and fix support for base less merges
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-10-02
F
re
d
rik
Kuivin
e
n
[PATCH] Te
a
ch
g
it-ls
-
files about '--' to denote end
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik Ku
i
vin
e
n
[PATCH] Teach the recursive merge strategy about
r
ename
s
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik Kuivin
e
n
[PATCH]
More descriptiv
e
messages for con
f
lict ca
s
es
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik
K
u
ivinen
[PATCH
]
r
e
c
u
r
si
v
e-merge: Don't pr
i
nt
a stack
trace
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fre
d
rik Kuivi
n
en
[
PATCH] Use the '
d
i
e
' fun
c
tion where it i
s
approp
r
iate
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[PATCH
]
Use a temporary inde
x
f
ile when we merg
e
the
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivin
e
n
[
PAT
C
H
]
Adjust
gi
t
-merge
-
recursive
.
py
f
or
t
he new tool
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
F
redrik K
u
ivinen
[PAT
C
H] Don't outpu
t
'A
u
t
omati
c
merge fail
e
d,
.
.
.
'
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kui
v
inen
[PA
T
CH] Be more
l
ike the
're
s
o
l
ve' strategy
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Ku
i
vinen
[PATCH
]
Rename
t
he
'
f
redrik' merge strat
e
gy to 'recursive
'
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Ku
i
vinen
[PA
T
CH] M
a
k
e
the ProgramErro
r
class
printable
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
Fr
e
drik Kuivinen
[PAT
C
H] Make su
r
e we
d
ie if we
don't g
e
t enough arguments
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
Fr
e
dr
i
k
Kuivinen
[PATCH] Int
r
oduce a 'die'
f
unc
t
io
n
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
F
r
edrik Kuivinen
[PATCH]
E
xit with status code
2
i
f we get an
exception
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Ku
i
vinen
[
PA
T
CH] F
i
x assertion failu
r
e when m
e
rgi
n
g comm
o
n ancestors
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-04
F
r
edr
i
k
Kuivinen
[PATCH]
M
ake
g
it-apply un
d
ers
t
and i
n
c
omplete lines
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree