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: leave unmerged entries in the index.
2005-12-03
Fredrik Kuivine
n
New test case
:
Criss-cro
s
s merge
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
F
re
d
r
ik Kuivinen
New test c
a
se: merge with
d
irectory/file co
n
f
l
icts
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik
K
u
i
vinen
t
e
st-lib
.
sh:
A
d
d
new function
,
test
_
exp
e
ct_code
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fr
e
drik Kuivinen
git-mer
g
e:
Exit with code 2
i
f no str
a
tegy was
abl
e
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-20
Fredrik
K
uivinen
merge-recursi
v
e
:
Replace
'except:'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik Kuivine
n
merge-
r
ec
u
rsi
v
e: Use '~' instead of '_' to separa
t
e
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fre
d
rik Kuivinen
m
e
rge-
r
e
cursive: Add copyright notice
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredri
k
Kuivinen
merge-recursive: I
n
de
n
t
t
h
e output
p
roperly
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fre
d
rik Kuivinen
merge
-
r
e
cursive: Fix
s
upp
o
rt for
b
ranch names
contain
i
ng
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fredri
k
K
u
i
vinen
merge-r
e
c
u
r
s
ive: Fix
limit
e
d output of rename messages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-08
Fredrik Kuiv
i
nen
merge-recursive: Only print relevant
r
ename messages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-03
Fredrik Kuiv
i
nen
[
P
ATCH] Enable a
n
d fix support for base less merges
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
F
r
edrik Kuivinen
[PATC
H
]
Te
a
ch git-
l
s-
f
iles about '--' to denote end
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
F
r
edrik Kuivinen
[PATCH] Teach th
e
recurs
i
v
e
m
erge s
t
rategy ab
o
ut re
n
ames
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik Kuivi
n
e
n
[PATCH] Mo
r
e
d
escript
i
ve
m
e
ssage
s
for co
n
fl
i
ct
cases
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fr
e
drik Kuivinen
[PATCH] recursive-
m
er
g
e: Don't print
a stack
t
ra
c
e
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik K
u
ivi
n
en
[
PATCH
]
Use the '
d
ie' function where it is appropriate
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Ku
i
vinen
[
P
A
TCH] Use a temporary
in
d
ex f
i
le when we merge the
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fr
e
d
rik K
u
ivinen
[PATC
H
]
Adjust
g
it
-
merg
e
-recursiv
e
.
py
f
or t
h
e new tool
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[PATCH] Don
'
t o
u
t
put 'Automatic merge fa
i
led
,
.
.
.
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivi
n
en
[
P
ATCH] Be mor
e
like
t
he 'resolve'
s
t
r
a
tegy
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredr
i
k
Ku
i
vine
n
[
PATCH]
R
ename the
'
fredrik'
merge strategy to '
r
ecursi
v
e'
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredri
k
K
u
ivinen
[PATCH]
Make the ProgramError class pr
i
ntable
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[PATCH] Make
sure we
d
ie if w
e
don'
t
get enoug
h
arg
u
ments
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[
PATCH]
Introduc
e
a 'die' f
u
n
c
tion
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fred
r
i
k
K
uiv
i
nen
[PATCH] Exit
w
ith
s
tatus code 2 if we get an exce
p
tion
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredri
k
Kuivinen
[PATCH]
Fix assertion failure when merging com
m
on ancestors
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-04
Fred
r
ik Kui
v
inen
[PA
T
CH]
M
a
k
e git-appl
y
un
d
erstand incomple
t
e lines
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree