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
New test case: Criss-cross merge
2005-12-03
Fredrik
K
uivinen
New test ca
s
e: Criss-cross merge
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-12-03
Fredr
i
k Kuivin
e
n
New test case: merge with
direc
t
ory/
f
ile conflic
t
s
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Kuiv
i
nen
t
e
st-li
b
.
sh:
Ad
d
new function,
test_expect_code
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Kuivinen
git-
m
er
g
e: Exi
t
with code 2
if no stra
t
egy
w
a
s
able
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-11-20
Fredri
k
Kuivi
n
e
n
m
erge
-
recursive: Rep
l
ac
e
'e
x
cept:'
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik
K
u
ivinen
merge-recursive: Us
e
'~'
i
ns
t
ea
d
of '_' to sepa
r
ate
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-11-12
Fre
d
rik
K
uivin
e
n
merge-recursive:
A
dd c
o
pyright notic
e
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-11-12
F
redr
i
k Kui
v
inen
merge
-
recur
s
ive
:
In
d
ent the
o
utput
p
roperly
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-11-09
Fred
r
ik Kui
v
inen
merge
-
recur
s
ive: Fix
s
upport f
o
r branch names cont
a
ining
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-11-09
Fredrik Ku
i
vinen
mer
g
e-recursive:
Fi
x
limited output of rena
m
e messages
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-11-08
Fredrik Kuiv
i
nen
m
e
rge-recursi
v
e: Onl
y
print relev
a
nt ren
a
me messages
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-10-03
Fredrik Kuiv
i
nen
[
PATCH] En
a
ble and fix support for base les
s
me
r
ges
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik Kuiv
i
nen
[PATCH]
Teach git
-
ls-files abou
t
'
--' to
d
eno
t
e end
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik Kuivinen
[PATCH] Teach t
h
e re
c
ursiv
e
merg
e
str
a
tegy a
b
out r
e
names
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-25
Fredr
i
k K
u
ivi
n
en
[PA
T
C
H
] M
o
re descrip
t
ive
messages
f
or conflic
t
cases
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik Kuivin
e
n
[P
A
TCH] recursive-merg
e
: Don't prin
t
a stack trace
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kui
v
in
e
n
[
P
ATCH] Use the 'di
e
'
f
unction where it is appropriate
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivine
n
[PATCH] Use a temporary index fi
l
e wh
e
n we merge
the
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
F
r
edrik Kuivin
e
n
[PATCH] Ad
j
u
s
t git-merge-recursive
.
p
y for the
ne
w
tool
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
F
r
edr
i
k Ku
i
vi
n
e
n
[PAT
C
H
]
Do
n
'
t
outpu
t
'A
u
t
o
m
atic merge failed,
.
.
.
'
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fr
e
drik Kuiv
i
nen
[PATCH] B
e
more like the 'resol
v
e'
strateg
y
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[PATC
H
] Rename
t
he 'fredr
i
k' merge strategy to
'recursive'
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik K
u
ivinen
[PA
T
CH] Ma
k
e the ProgramE
r
ror c
l
ass
p
rintabl
e
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
Fre
d
rik K
u
ivinen
[
PATC
H
]
Make sure we die if we
d
on't get enough
a
r
guments
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
F
r
e
d
rik Ku
i
vinen
[PATCH] I
n
tr
o
d
u
ce a 'die' function
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik K
u
ivinen
[PATCH]
Exit with sta
t
u
s
c
o
de 2 if
w
e
get a
n
excep
t
ion
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[PATCH]
Fix a
s
sertion fail
u
re whe
n
merging common a
n
cestors
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-04
Fredrik
Kui
v
inen
[P
A
T
CH]
Make git-
a
pply unde
r
stand
inc
o
m
p
lete lines
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree