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
Use printf rather than echo -n.
2005-12-03
Fredrik Kuivinen
New
test case: C
r
iss-cross merge
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Kuivi
n
en
New test case:
mer
g
e with direct
o
ry/fil
e
c
onflic
t
s
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik K
u
i
vinen
test-lib
.
sh: Ad
d
new
f
unctio
n
,
t
e
s
t_expect_cod
e
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Kuivinen
git-m
e
rge: Ex
i
t with code 2 if
no strat
e
g
y wa
s
able
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-20
F
re
d
rik Kuivinen
merge-
r
e
c
u
rsi
v
e: Rep
l
a
ce 'except:'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
F
redr
i
k
K
uivi
n
e
n
merg
e
-recursive: Use
'
~' ins
t
ead of
'
_'
t
o
s
epa
r
ate
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fred
r
ik Kuivine
n
merge-recu
r
sive
:
Add cop
y
right notice
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik Kuivinen
merge-recurs
i
ve:
I
n
d
e
n
t the outpu
t
p
r
operly
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fredrik Kuiv
i
nen
merge-recursiv
e
:
F
ix support f
o
r b
r
anch n
a
m
es contai
n
ing
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fredrik Kuivin
e
n
merge-recursive: Fix limit
e
d output of re
n
ame messa
g
es
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-08
Fred
r
i
k
Kuivinen
merge-r
e
cursive: Only p
r
in
t
rel
e
vant rena
m
e messa
g
es
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-03
Fredrik
K
uivinen
[PATCH] Enable and
fix
support for
bas
e
less
me
r
ges
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
F
redr
i
k K
u
ivinen
[PA
T
CH] Teach
g
it-ls-f
i
les
about '--' to denote
e
nd
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredr
i
k Kuiv
i
n
en
[PATCH] T
e
ach the recurs
i
ve mer
g
e
s
t
r
a
tegy
about renames
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredr
i
k
Kuivinen
[
PATCH
]
Mor
e
d
e
scriptive messag
e
s fo
r
conflict cases
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
F
r
edrik Kuivin
e
n
[
P
ATCH] recurs
i
ve
-
merg
e
:
D
on't print a
s
tack
trace
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuiv
i
nen
[PA
T
CH] Use the 'die' function w
h
ere it is
a
pp
r
opriate
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
r
edrik Kuivinen
[PATCH
]
Use a t
e
mp
o
r
a
ry inde
x
f
ile when we
m
erge the
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
redri
k
K
u
ivinen
[P
A
TCH]
A
dju
s
t git-merge
-
r
e
cursive
.
py for the ne
w
tool
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fr
e
dr
i
k Kuivinen
[PATCH] Don't output 'A
u
tomatic merge failed,
.
.
.
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Ku
i
vinen
[PATC
H
]
Be more
l
ike the 'resolve' strat
e
g
y
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
r
edrik Kuivin
e
n
[PATCH] R
e
n
a
me the 'fr
e
drik
'
merg
e
s
t
r
a
tegy to 'recursive'
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivine
n
[PATCH] Make t
h
e
Program
E
rror cl
a
ss printable
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[PATCH] Make sure we
d
i
e
if
w
e don't get enough
a
rgumen
t
s
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredr
i
k
K
ui
v
inen
[PATCH] Introduce a 'd
i
e' function
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredr
i
k Kuivinen
[PATCH] Exit with
status cod
e
2
i
f
w
e
get a
n
exception
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[P
A
T
CH] Fix assertion failure when mer
g
ing
c
ommon anc
e
sto
r
s
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-04
Fredrik K
u
i
vinen
[PATCH] Ma
k
e
g
i
t-
a
pply understand i
n
c
o
mp
l
ete l
i
nes
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree