repo.or.cz
/
git
/
repo.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
merge-recursive: Fix support for branch names containing slashes
2005-11-09
F
redrik Ku
i
vin
e
n
me
r
ge-recursive: Fix
s
upport for bra
n
ch
n
ame
s
c
o
n
t
aining
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-11-09
Fredrik Ku
i
vinen
merge-recurs
i
ve: Fix lim
i
ted ou
t
p
ut of
rename
mes
s
ages
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-11-08
Fredrik
K
u
ivinen
mer
g
e-recursi
v
e: On
l
y
print rele
v
ant rename messag
e
s
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-10-03
F
redrik Kuivinen
[PATCH]
E
nable
a
nd
f
ix support for
b
a
se
less merge
s
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-10-02
Fre
d
rik
Kuivinen
[PA
T
CH
]
Teach
g
i
t-ls-files about
'
--' to denote end
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik Kuivine
n
[PATCH
]
Teach the recu
r
sive merge
strategy about r
e
names
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik
Kuivin
e
n
[PAT
C
H] M
o
re descri
p
tive
messages fo
r
con
f
l
i
ct cases
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-25
Fre
d
r
ik Kuivi
n
en
[P
A
TCH] recu
r
sive-mer
g
e: D
o
n't print
a
s
tac
k
trace
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fre
d
rik Kuivinen
[PATCH] Us
e
the 'die' fu
n
c
t
i
o
n where it
i
s appr
o
p
r
iate
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[PATCH]
Use a temporary
ind
e
x
fi
l
e w
h
en we merge the
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
F
red
r
ik K
u
ivi
n
en
[
P
ATC
H
] Adjust gi
t
-merg
e
-r
e
cursive
.
p
y
for the new tool
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[
P
AT
C
H] Don't output 'Automatic merg
e
failed,
.
.
.
'
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fre
d
rik
K
uivinen
[PATCH] Be m
o
re like the
'
resolv
e
' strategy
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
F
r
edrik Kuivinen
[PATCH] Rename the
'
fre
d
rik'
m
erge strategy to 'rec
u
rsive'
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
Fr
e
dri
k
Kuivinen
[PATCH
]
Make the ProgramError class
p
r
i
n
t
abl
e
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
Fre
d
r
i
k Kuivine
n
[PATCH
]
Make sure we
d
ie i
f
we
d
on't
g
et
e
n
ough argumen
t
s
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
Fr
e
dri
k
Kuivinen
[PATCH] Introduce
a
'
d
ie' fu
n
ction
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[PATCH]
E
xit with
s
tatus code 2 if we ge
t
an
e
xception
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
Fredr
i
k Kuivinen
[PATCH]
F
i
x asser
t
ion failur
e
when mergin
g
common ancestors
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-04
Fredrik Kuiv
i
ne
n
[
PAT
C
H] Make
g
it-apply
und
e
rst
a
nd incomplete lines
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree