repo.or.cz
/
git
/
gitweb.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: merge with directory/file conflicts
2005-12-03
Fredrik Kuivin
e
n
New test case:
m
e
r
ge with di
r
ectory/
f
ile conflicts
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Kuivinen
te
s
t-lib
.
sh: Add new functi
o
n, te
s
t_expect
_
co
d
e
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik K
u
ivinen
git-merge:
Exit with cod
e
2 if no st
r
a
tegy was able
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-11-20
Fredr
i
k Kuivine
n
merge-recursive: Replace
'
e
x
c
ept:
'
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-11-12
Fr
e
dr
i
k Kuivinen
m
e
rge-recu
r
s
i
ve:
U
se '~' instead of '_' to sepa
r
a
t
e
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik Kuivinen
merge-recursive: Add copy
r
ight noti
c
e
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik
K
u
ivi
n
en
merge-recursive:
Indent t
h
e
output p
r
o
perl
y
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-11-09
Fredrik Kuivinen
merge-re
c
urs
i
ve:
F
i
x support for
b
r
a
n
ch n
a
mes c
o
ntain
i
ng
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-11-09
Fre
d
rik Kuiv
i
nen
me
r
ge-
r
e
cursive: Fix
l
imited output of rename messag
e
s
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-11-08
Fredrik Kuivinen
merge-recursive: Only print relevant rename mes
s
ag
e
s
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-10-03
Fre
d
r
i
k Kuivinen
[PATCH] Enable
and fix suppo
r
t
f
or
b
a
se less merges
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-10-02
F
r
edr
i
k Kuivin
e
n
[PATCH] Teach git-ls-files
abou
t
'--' to denote end
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-10-02
Fredr
i
k Kuivin
e
n
[PAT
C
H] Teach the rec
u
rsive me
r
ge
s
t
rategy about renames
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-25
Fredr
i
k
Kuivinen
[
PATCH] More
d
escriptiv
e
m
essa
g
es for
c
onflict cases
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-25
F
r
edrik Kui
v
inen
[
P
ATC
H
] recursive
-
merge
:
Don't print a
s
tack trace
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[
P
ATCH] Use the 'die' function
wher
e
it is approp
r
iat
e
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kui
v
inen
[
P
ATCH] Use a temporary index fil
e
when we merg
e
th
e
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fredr
i
k
K
uiv
i
nen
[PATCH] Adjust git-m
e
rge-r
e
cursiv
e
.
py for th
e
new tool
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fr
e
drik
Kui
v
in
e
n
[PATCH] Don't output 'Automatic merg
e
failed
,
.
.
.
'
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[PATC
H
] Be mor
e
l
i
ke the
'resolve'
strate
g
y
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik
Kuivine
n
[PA
T
CH]
R
ename
t
he 'f
r
edrik
'
merge
s
t
rategy to
'
recu
r
sive'
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivine
n
[
P
ATCH] Make the Progr
a
mError cla
s
s pr
i
ntable
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
Fredr
i
k K
u
ivin
e
n
[PATC
H
]
Make sure w
e
die if we
d
on't get
e
n
o
ugh arguments
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
Fre
d
r
i
k
Kuivinen
[PATCH]
I
n
troduce a 'die'
f
unction
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivi
n
en
[PAT
C
H] Exit with status code 2
i
f we g
e
t an exception
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
Fredri
k
K
uivinen
[PATCH] Fix
as
s
e
r
t
i
o
n
failure wh
e
n mergi
n
g
c
o
mmon an
c
estors
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-04
Fredrik Kuivine
n
[PATC
H
] M
a
ke
git-apply understand inc
o
mplete lines
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree