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
merge-recursive: Indent the output properly
2005-11-12
Fr
e
drik
K
uivinen
merge-r
e
cursive: Indent t
h
e output properly
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
F
redrik Kuivinen
merge-recursive:
F
ix
support
f
or bra
n
ch names
contai
n
ing
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fre
d
rik
K
u
ivinen
merge-r
e
cu
r
sive: Fix limited
o
utput of
r
ename
m
essages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-08
Fred
r
ik
K
uivinen
m
er
g
e-re
c
u
r
sive: O
n
ly print re
l
evant
r
ename me
s
sages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-03
F
r
edri
k
K
u
ivi
n
en
[PATCH] Enabl
e
and
fix support for base less merges
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik
K
u
i
vinen
[PATCH] Tea
c
h git-ls-file
s
a
b
out '
-
-
'
t
o den
o
t
e
end
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fred
r
ik
Kuivi
n
e
n
[PA
T
CH] T
e
ach the r
e
cursive
merge strategy
a
bout re
n
ame
s
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fr
e
drik Kuiv
i
nen
[PATC
H
]
More desc
r
iptive message
s
for conflict ca
s
e
s
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fre
d
rik Kuivinen
[PATCH
]
re
c
ursi
v
e-merge:
Don't print a stack trace
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik
Kuivine
n
[PATC
H
] Use
the
'
di
e
'
functi
o
n wher
e
it is
ap
p
ropriate
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredri
k
Kui
v
inen
[PATCH
]
Use a temporary index file when we merge
t
he
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fr
e
drik Kuivinen
[PATCH
]
Adjust git-me
r
ge-recur
s
i
ve
.
py f
o
r the new tool
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[
P
A
TCH
]
Don't
output 'Automatic merge faile
d
,
.
.
.
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredri
k
K
uivinen
[PATCH] Be more like the 'r
e
solve'
s
trategy
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivine
n
[
PA
T
CH] R
e
nam
e
the 'fredrik'
m
erg
e
s
t
rategy
t
o 'recursive'
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivi
n
e
n
[PATCH] Make the Pr
o
g
ramError class
p
rintable
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik K
u
ivi
n
en
[PATC
H
] Make sure w
e
die if
w
e
don't get e
n
ough
a
rguments
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuiv
i
nen
[P
A
TCH] Int
r
oduce a 'die'
f
unction
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[PAT
C
H] Exit with status
code 2 if we get an exception
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik
Kuivinen
[
PATCH] Fix assert
i
on
f
ailure
w
hen
m
er
g
i
n
g common ancestors
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-04
Fredrik
K
uivinen
[PATCH] Make
g
it
-
apply u
n
d
e
rstand
incomp
l
ete lines
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree