repo.or.cz
/
git
/
spearce.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
git-merge: Exit with code 2 if no strategy was able to handle the merge.
2005-12-03
Fre
d
r
ik K
u
i
vinen
git-me
r
ge: Exit
w
it
h
c
ode 2 if no strat
e
gy was able
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-11-20
Fredrik Ku
i
v
i
n
en
m
e
rge-recursive:
Replace 'exce
p
t:'
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-11-12
Fredr
i
k Ku
i
vi
n
e
n
me
r
g
e-re
c
ursive: Use '
~
' inst
e
ad of '_' to separate
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-11-12
Fredr
i
k Kuivine
n
mer
g
e-recursive: A
d
d
copy
r
ight n
o
t
ice
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-11-12
Fr
e
d
rik Kuivi
n
en
m
e
r
g
e-recurs
i
ve: Indent the output properly
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-11-09
Fr
e
dri
k
Ku
i
vinen
m
erge-recur
s
ive: Fix support fo
r
branch
na
m
es cont
a
inin
g
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-11-09
Fredrik Kuivinen
me
r
g
e
-recursive: Fix limited output of ren
a
m
e
messages
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-11-08
Fredrik Kuivin
e
n
merge-recursive: Only print releva
n
t re
n
ame m
e
ssages
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-10-03
Fredrik Ku
i
vin
e
n
[PATCH] E
n
abl
e
a
n
d
f
i
x
s
upport for base less merges
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-10-02
Fr
e
drik Kuiv
i
nen
[PATCH] Te
a
ch
g
it-
l
s-
f
il
e
s
about '--' to denote end
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-10-02
Fredri
k
Kuivinen
[P
A
TCH]
Teach
t
he recursive merge
s
trategy about renames
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-25
Fr
e
drik
Kuivinen
[PATCH] More descripti
v
e
messages for conflict cases
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik
K
uivinen
[
P
ATC
H
] recur
s
ive-merge: D
o
n't print a
s
t
a
c
k
t
race
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kui
v
inen
[PAT
C
H] Use t
h
e
'die' fun
c
tion whe
r
e it is app
r
opri
a
te
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik K
u
ivin
e
n
[PATCH] U
s
e
a
temp
o
r
ary ind
e
x file wh
e
n we merge the
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[PATCH
]
A
d
just git-merge-recursiv
e
.
py for
t
h
e new tool
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kui
v
inen
[PA
T
C
H]
Do
n
't output 'A
u
toma
t
ic merge failed,
.
.
.
'
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[PATCH] Be mor
e
l
i
ke
the 'resolve' strategy
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[PATCH] Rename the 'fredrik' merge s
t
rategy to 'recur
s
iv
e
'
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivine
n
[PATCH] Make t
h
e ProgramEr
r
or class printable
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivin
e
n
[PATCH]
M
ake sure we di
e
if w
e
don
'
t get eno
u
g
h
arguments
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
F
redrik Ku
i
v
in
e
n
[P
A
TCH] Introduce a 'die' function
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
Fredr
i
k Kuiv
i
nen
[PATCH] Exi
t
with status code 2 if
we g
e
t an e
x
ception
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
Fredr
i
k
Ku
i
vine
n
[
PATCH] Fix as
s
ertion failu
r
e wh
e
n merging common
a
ncestors
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-04
Fredrik
Kuivinen
[
P
ATCH]
M
ake git-appl
y
understand incomplete
li
n
e
s
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree