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
merge-recursive: Fix support for branch names containing slashes
2005-11-09
F
r
edrik Kuivinen
merge-recurs
i
ve: Fix
s
upp
o
rt
for branc
h
names cont
a
ining
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-11-09
Fredrik
Kuivinen
mer
g
e-
r
e
c
ursive: Fix l
i
mited
o
utpu
t
of
rename messages
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-11-08
Fredrik Kuivinen
merge-recurs
i
v
e
:
O
nly
print
releva
n
t rename mess
a
ges
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-10-03
Fredri
k
Kuivinen
[PATCH] Enable and fix sup
p
o
rt
f
o
r base l
e
ss merges
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-10-02
Fre
d
rik
K
uivin
e
n
[
P
ATCH] T
e
ac
h
g
it-ls-files ab
o
ut '--' to d
e
note e
n
d
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-10-02
Fr
e
d
rik Kuivinen
[PATCH] T
e
ac
h
the recursive m
e
rge strat
e
g
y
ab
o
ut renames
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-25
Fred
r
ik
Kuivi
n
en
[PA
T
C
H
]
More des
c
riptive messages for co
n
flic
t
cases
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-25
Fredri
k
Kuivinen
[
P
ATCH
]
recursi
v
e-merge: D
o
n't print a stack trace
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
F
redrik
Kuivinen
[
P
ATCH
]
Use
t
he '
d
ie' function wh
e
re
it is
a
ppropriate
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik K
u
ivinen
[PATCH]
Use a temporary index
fi
l
e wh
e
n we
me
r
g
e
the
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fr
e
drik Kui
v
inen
[PATCH] Adju
s
t
gi
t
-merge-re
c
ur
s
ive
.
py for the new tool
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivine
n
[
P
ATCH
]
Don't out
p
ut 'Automa
t
ic merge failed,
.
.
.
'
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[PA
T
CH] Be more like the 'resol
v
e' strategy
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
F
redrik Kuivinen
[P
A
TCH] Rename the 'fredrik' merge strateg
y
to 'recur
s
iv
e
'
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
F
redrik Ku
i
v
in
e
n
[PATCH] Make t
h
e
Progr
a
mError class printable
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
Fr
e
drik Kuivinen
[PATCH]
M
ake sure
we die if
w
e d
o
n
'
t get enou
g
h arguments
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
Fred
r
i
k
Kuivinen
[PATCH] Intr
o
duce a 'die' func
t
ion
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[PATCH
]
Exi
t
wit
h
status code 2 i
f
we g
e
t
a
n excepti
o
n
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik
Kuivinen
[PATCH] Fix
assertion failure wh
e
n merging common an
c
estors
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-04
Fredrik Kuivinen
[
PATCH] Make git-a
p
p
l
y u
n
derst
a
nd incomplete li
n
es
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree