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
New test case: Criss-cross merge
2005-12-03
F
r
e
drik Kuivinen
New
test
ca
s
e
:
Criss
-
cross merge
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik K
u
i
vi
n
en
New test case:
m
e
r
ge w
i
th directory/file conf
l
icts
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-12-03
Fredr
i
k
K
u
ivinen
test-lib
.
sh: Add new func
t
io
n
,
test_ex
p
ect_code
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-12-03
F
re
d
r
i
k Kuivinen
git-m
e
rge: Exit wi
t
h code 2 if no strategy was
a
ble
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-11-20
Fredrik Kuiv
i
nen
merge-recursive: Repla
c
e 'except:'
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik Kuivinen
mer
g
e-recursive: Use '~' instead of '_' to
s
e
parate
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik Kuivin
e
n
merge
-
recursive: Add copyright notice
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik Kuivi
n
en
me
r
ge-
r
ecur
s
ive: Indent the output properly
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-11-09
F
redri
k
Kuivinen
merge-recu
r
sive: Fix supp
o
rt for branc
h
na
m
es
con
t
aining
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-11-09
Fredrik K
u
i
vinen
m
e
rge-recursive:
Fix
limi
t
ed output of rename mes
s
a
ges
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-11-08
Fredrik
K
ui
v
inen
merge-r
e
cur
s
i
v
e: Onl
y
p
rint rele
v
a
n
t r
e
n
a
me messag
e
s
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-10-03
F
r
edrik Kuivine
n
[PATC
H
] Enab
l
e and fix su
p
port
f
or base
less me
r
ges
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-10-02
F
redri
k
Kuivinen
[PATCH] Teac
h
git-ls-
f
il
e
s
a
bout '-
-
' t
o
denote en
d
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik
K
uivinen
[
PATCH] Te
a
ch
the recursive merge strategy
about
r
en
a
mes
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik
K
uivinen
[PATCH] More
desc
r
ip
t
i
ve messages for conflict cas
e
s
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-25
F
redrik Kuivinen
[PATCH] recursive-merge: Don't print a sta
c
k trace
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kui
v
i
n
en
[PATC
H
] Use the
'
d
ie' function where
it is appropriate
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fred
r
ik Kuivinen
[PATCH] Use
a tem
p
orar
y
i
ndex file
whe
n
we
m
erge the
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fre
d
rik Kuivinen
[PATC
H
] Adjust g
i
t-merge-recursive
.
py for the new tool
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fredri
k
K
u
i
vinen
[PATCH] Don't o
u
tpu
t
'Aut
o
matic merge failed,
.
.
.
'
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[PATCH] Be
more like
t
he 'resol
v
e' s
t
rate
g
y
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
F
redr
i
k
K
uivinen
[PATC
H
] Rename the
'
fredrik
'
me
r
ge strategy to 'r
e
cursive'
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[PATCH] M
a
ke
the P
r
ogramError clas
s
printable
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kui
v
i
n
en
[PATCH] M
a
ke sure we die if we don't get
e
nou
g
h argumen
t
s
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
Fr
e
d
rik Kuivin
e
n
[
P
ATC
H
] Introd
u
ce a 'd
i
e'
fu
n
ctio
n
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik
K
u
ivinen
[PATCH] Exit with status
code 2 i
f
we get
a
n exce
p
tion
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Ku
i
vin
e
n
[
PATCH] Fix asser
t
ion failure when merging commo
n
ancestors
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-04
Fr
e
drik Kuivi
n
e
n
[PATCH] Make git-apply underst
a
nd
i
ncomplete
l
ines
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree