repo.or.cz
/
alt-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
svnimport: exit cleanly when we are up to date
2005-12-14
F
redrik Kuivinen
Usage messa
g
e
cle
a
n
-up, tak
e
#
2
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Ku
i
vinen
Ne
w
test ca
s
e: Criss-cross merge
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
F
r
e
d
rik Kuivine
n
N
e
w test case: merge with direct
o
ry/file conflicts
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Kuiv
i
nen
test-li
b
.
sh: Add new
f
unction,
t
est_expect_code
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik K
u
ivinen
git
-
merge: Exit with code
2
if no strategy was able
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-20
Fr
e
drik Kuivinen
merge-re
c
ursive:
Replace 'excep
t
:'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fr
e
dri
k
Ku
i
vinen
me
r
ge-recursive: Use '~' i
n
stead
of '_'
t
o separate
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
F
redrik Kuivinen
merge-recursi
v
e: Add cop
y
right notice
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fr
e
drik
Kuiv
i
nen
merge-recursive:
I
nde
n
t the o
u
tput proper
l
y
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fredrik Kuivinen
merge-recursive: Fix suppo
r
t for branc
h
n
a
mes containin
g
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fredrik Kuivinen
m
erge-recurs
i
ve: F
i
x
l
imited output of rename
messages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-08
Fredrik Kuivin
e
n
mer
g
e-recur
s
i
v
e:
Only print
relevant rename me
s
sages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-03
Fredrik Kuivin
e
n
[PATCH] Enable an
d
f
i
x
support for base less merges
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik
K
uivinen
[PATCH] T
e
ach g
i
t-
l
s-
f
ile
s
ab
o
ut '--' to denote en
d
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik Kuivinen
[PATCH] Teach the rec
u
rsi
v
e merge strategy
a
b
o
ut renames
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik
K
u
ivinen
[
PATCH] More desc
r
i
ptive me
s
s
a
g
es
f
or c
o
nflict cases
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredri
k
Kuivinen
[PATCH] recursi
v
e-merge: Don't pri
n
t
a
stack trace
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik
Kuivine
n
[
P
ATCH] Use t
h
e
'die'
f
un
c
t
ion
w
here it
is appropr
i
ate
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik
K
uivinen
[PATCH]
U
se a
tempo
r
ary in
d
e
x
file when we merge the
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
re
d
r
ik Kuivinen
[PATCH] Adjust git-merge
-
recursi
v
e
.
py
for the n
e
w tool
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
r
edrik Kuiv
i
n
e
n
[
PAT
C
H]
D
o
n't outp
u
t 'Automatic merge fai
l
ed,
.
.
.
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Ku
i
vinen
[P
A
TCH]
B
e
m
o
re like the
're
s
olve' strategy
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fr
e
drik Kuiv
i
nen
[
P
A
TCH]
R
ename
t
he 'fredr
i
k' merge strategy to 'recurs
i
v
e
'
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[P
A
TCH]
M
ake the ProgramError class printabl
e
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
F
r
edrik Kuivinen
[PATCH
]
M
a
ke
s
ure w
e
die if we
d
o
n't get enough a
r
guments
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivine
n
[PATCH] Introd
u
c
e
a
'
die' functi
o
n
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[PATCH] Exit w
i
t
h
status code 2 if we get a
n
excep
t
ion
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik K
u
i
vinen
[PATCH] Fix
a
sse
r
tion
f
ail
u
re
when mer
g
ing common ancestors
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-04
Fredrik Kui
v
i
n
e
n
[PAT
C
H]
Make g
i
t-apply unders
t
and incomp
l
e
t
e
lines
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree