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
Everyday: a bit more example.
2005-12-03
Fre
d
rik
Kuivinen
New test case:
C
riss-cross
m
er
g
e
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fred
r
ik Ku
i
vin
e
n
N
ew
t
est
c
ase:
merge
w
i
t
h d
i
r
e
ctory/file
conflic
t
s
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik
Kuivinen
test-lib
.
s
h
: Add new fun
c
t
ion, t
e
st_exp
e
ct_code
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Kuivinen
git-merge: Exit with c
o
de 2
if no stra
t
egy
was ab
l
e
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-20
Fred
r
ik Kuivinen
merge-re
c
ursive: Replace '
e
xc
e
pt:'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
F
r
edrik Kuivine
n
m
e
rge-recursive: Us
e
'~' in
s
t
ead of '_' to sep
a
rate
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik Ku
i
vi
n
e
n
merge-re
c
ursive: A
d
d
c
opyright notice
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fr
e
drik Kuivinen
merge-rec
u
rsive: Indent the outp
u
t properly
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fredrik Ku
i
vinen
merge-recursi
v
e: Fix sup
p
ort for bran
c
h names
co
n
t
a
i
ning
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fr
e
drik Kuivinen
merge-
r
ecursive:
Fix limited output o
f
r
e
name m
e
ss
a
ges
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-08
F
r
edrik Kuivinen
merge-recursive: Only pr
i
nt r
e
le
v
ant r
e
name m
e
ssag
e
s
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-03
F
redrik Ku
i
v
i
n
e
n
[PATCH] Enable an
d
fix support for base less merges
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fred
r
i
k
Kuivinen
[
PATC
H
]
Teac
h
git-ls-
f
iles abo
u
t
'--' to denote e
n
d
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik Kuivinen
[PA
T
CH] Teach t
h
e recursive merge str
a
t
e
g
y
a
b
out renames
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
F
r
edrik Kuivinen
[PATCH] More desc
r
iptiv
e
m
essages for
conflict cases
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik K
u
iv
i
nen
[PA
T
CH]
re
c
ur
s
ive-merge: Don't print a stack trac
e
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik
K
uivinen
[
P
ATCH] Us
e
t
h
e 'die' function where it
i
s
a
ppropriate
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fre
d
r
i
k Kuivinen
[
PATCH] Use
a tempora
r
y
ind
e
x fil
e
when we
m
erge the
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
r
e
drik Kuivinen
[
PATCH] Adjust
git-merge-recursive
.
py for the new tool
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredr
i
k Kuivinen
[PATCH
]
Don
'
t output '
A
ut
o
matic merge failed,
.
.
.
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredr
i
k
Kuivinen
[
P
ATCH] Be mo
r
e like the 'resolve
'
s
t
rat
e
g
y
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[PATCH] Re
n
a
m
e the 'fredrik' merge
s
t
rategy to
'
re
c
ur
s
ive'
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredri
k
K
u
ivinen
[PATCH] M
a
ke the Prog
r
amE
r
ror class
printable
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik K
u
ivin
e
n
[PATCH] Ma
k
e
s
u
r
e we die if
we
d
o
n
'
t
get enoug
h
argume
n
ts
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fr
e
dr
i
k
Kuivinen
[
PATCH] Introdu
c
e a 'die' funct
i
on
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fred
r
ik Kuivinen
[PATCH] Exi
t
w
i
th
statu
s
c
ode 2 i
f
w
e
get
an ex
c
eption
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
F
redrik Kuivinen
[PATCH]
F
ix assertion fa
i
lure when merg
i
ng co
m
mon anc
e
stors
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-04
Fre
d
rik Kuivinen
[PA
T
CH]
M
a
k
e git-a
p
ply
understand incomplete lines
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree