repo.or.cz
/
debian-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Add deltifier test.
2005-12-03
Fredrik Ku
i
v
inen
New
t
e
st case: Criss-cross merge
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Kuivinen
N
ew
test case: merge wi
t
h direct
o
ry/file confli
c
ts
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredri
k
Kuivinen
test
-
lib
.
sh:
A
d
d
new
functio
n
,
t
es
t
_expect_code
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredri
k
K
u
i
v
inen
g
i
t-merge: Exi
t
with
code
2
if no strategy was able
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-20
F
r
edrik Kuivinen
merge-
r
ecursiv
e
: Replace 'except:'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredri
k
K
ui
v
inen
m
erge-recursive:
U
s
e '~' ins
t
ead
o
f '
_
' to separate
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik Kuiv
i
nen
merge-recu
r
sive:
A
d
d copy
r
ight noti
c
e
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik Kui
v
inen
m
erge
-
re
c
ursive: I
n
den
t
the
output properly
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fredrik K
u
ivinen
merge-recurs
i
ve:
F
ix support
f
or branch
na
m
e
s
containing
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fredrik
K
uivinen
merge-recursiv
e
:
F
ix
li
m
ited outp
u
t of rena
m
e
messa
g
e
s
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-08
Fredri
k
K
ui
v
inen
me
r
ge
-
recursive: Only prin
t
r
e
levant rename messa
g
es
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-03
Fredr
i
k Ku
i
vine
n
[PATCH] Ena
b
l
e
and fix support
f
or base
less merg
e
s
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik Ku
i
vinen
[PAT
C
H] Teach git-ls-fil
e
s abo
u
t '
-
-
' to denote e
n
d
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
F
redrik Kuivinen
[PATC
H
] Teach the r
e
c
u
rsive
m
erg
e
str
a
t
e
gy about rena
m
es
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredr
i
k Kuivinen
[PATCH] More descriptive message
s
fo
r
c
onflict cases
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik Kuivinen
[PATC
H
] recursive-
m
erge: Don't
prin
t
a sta
c
k tr
a
c
e
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[PA
T
CH] Use the 'die' function
w
he
r
e it
i
s appropriate
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredr
i
k Kui
v
inen
[
P
A
TCH] Use a te
m
porary i
n
dex file whe
n
w
e
me
r
ge the
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kui
v
i
nen
[
PA
T
CH
]
A
d
just git-mer
g
e-recursive
.
p
y
for the new tool
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik K
u
ivinen
[
PATCH] Don't
o
utput 'Automatic merg
e
failed,
.
.
.
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredri
k
Kuivinen
[PATCH]
Be
m
ore
l
i
k
e th
e
'
r
e
solve'
strateg
y
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredri
k
K
u
ivinen
[PA
T
CH] Rename the 'fredrik' merge st
r
ategy to
'
recursive
'
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
F
r
e
d
rik
Kuivinen
[PAT
C
H]
Mak
e
the ProgramError class
printable
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fr
e
drik K
u
ivinen
[PATC
H
] Make sure
w
e
die
if
we d
o
n
'
t get
enough a
r
gum
e
nts
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredr
i
k Kuivinen
[
P
ATCH
]
Introduce a 'di
e
'
function
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivine
n
[P
A
TCH] Exit with
s
t
atus co
d
e 2
i
f
we get an exception
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredr
i
k Kuivinen
[
PATCH] Fix assertion failure when merging com
m
on a
n
cestor
s
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-04
Fredr
i
k Kuivinen
[PAT
C
H] Make
g
it-apply und
e
rstand in
c
o
mplete li
n
es
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree