repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Usage message clean-up, take #2
2005-12-14
Fredrik Kuivinen
Usage message
clean-up, take #2
commit
|
commitdiff
|
tree
2005-12-03
Fred
r
ik Kuivinen
New
test
c
ase:
C
ri
s
s-
c
ross merge
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Kuivinen
N
ew t
e
s
t case
:
merge with
di
r
ecto
r
y/file con
f
lict
s
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik
K
uivinen
test-lib
.
sh:
A
d
d
new funct
i
on, test
_
expe
c
t_
c
ode
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Ku
i
vinen
git-merge: Exit w
i
t
h
code 2 if no stra
t
e
gy was able
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-11-20
Fredrik Kuivinen
merge-recursive:
Rep
l
ace 'exc
e
pt:'
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-11-12
F
r
edrik Kuivinen
m
e
r
ge-recursive: Use '~' instead of '_' to s
e
parate
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-11-12
F
redrik Kuiv
i
nen
merge-recurs
i
ve:
A
d
d c
o
pyri
g
ht no
t
ice
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-11-12
Fredr
i
k Kuivinen
m
erge-recursive: Indent the outpu
t
properly
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-11-09
Fredri
k
Ku
i
vinen
merge-recursive: Fix s
u
pport for bran
c
h nam
e
s contai
n
ing
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-11-09
F
r
ed
r
i
k
Kuivin
e
n
merge-recursiv
e
:
Fix limited output of rename mess
a
ges
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-11-08
Fr
e
drik Kuivinen
mer
g
e
-recursive: Only
print rele
v
ant rename
messages
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-10-03
Fred
r
ik Kuivinen
[PATCH] Ena
b
le 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
edri
k
K
u
ivinen
[PATCH] T
e
ach
gi
t
-ls-
f
i
le
s
a
b
out '--' to denote end
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik
K
uivinen
[PATC
H
] Teach the recur
s
ive merge strategy abo
u
t renames
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik Kuivinen
[PATCH] Mo
r
e d
e
scripti
v
e messages for conflict ca
s
es
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik Kuivinen
[
P
ATCH] recursive-me
r
ge: Don't prin
t
a stack trac
e
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Ku
i
vinen
[PAT
C
H]
U
se the 'die' fun
c
tion wher
e
i
t
is ap
p
ropriate
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Ku
i
vinen
[PATCH] U
s
e a tempora
r
y
index
f
ile when
we
m
e
r
ge the
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Ku
i
v
i
nen
[
PATCH] Adjust
git-me
r
ge-recursi
v
e
.
py for the new
tool
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fredr
i
k K
u
ivinen
[
P
ATCH] D
o
n
'
t o
u
t
p
u
t 'Automatic
m
erge failed,
.
.
.
'
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik K
u
i
v
in
e
n
[PATCH]
Be more li
k
e the 'resolve' stra
t
egy
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivin
e
n
[PATCH] Rename the '
f
r
edrik' merge strat
e
gy to 'r
e
cursive'
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
F
red
r
ik Kuivinen
[PATCH]
M
a
k
e the Pro
g
ram
E
rror class printable
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[
PATCH] Make
sure we die if
w
e don't get enough argument
s
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
Fred
r
i
k
K
uivinen
[PATCH] Introdu
c
e a 'die' fu
n
ction
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
Fre
d
rik
Kuiv
i
nen
[
PATCH] Exit with status code 2
i
f
we get an
ex
c
e
p
tion
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
Fr
e
drik Kuivi
n
e
n
[PATCH]
F
ix a
s
sertion failure when merging
common ancestors
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-04
Fredrik Kuivinen
[PA
T
C
H
] M
a
ke gi
t
-app
l
y understand incomplete lines
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree