repo.or.cz
/
git
/
gitweb.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
Fredrik Kuivinen
merge-recursive:
Indent the output properly
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-11-09
Fredrik Ku
i
vinen
merge-recursive
:
Fi
x
sup
p
ort for branc
h
names
containing
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-11-09
Fr
e
d
r
ik Kuiv
i
nen
merge-r
e
c
ursive: Fi
x
limi
t
ed output
o
f
ren
a
me messages
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-11-08
Fr
e
drik Kuivinen
merge-recursive: Only
p
rin
t
rele
v
ant rename messages
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-10-03
Fr
e
drik Kui
v
inen
[PATCH] Enable and fix su
p
po
r
t for b
a
se less
merges
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik Kuivinen
[PATCH
]
T
e
a
ch git-ls-files about '
-
-' to den
o
te end
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-10-02
F
r
edrik Kuivinen
[PATCH] Teach the recursive m
e
rge strategy
a
bout renames
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik Kui
v
inen
[PATCH] More de
s
c
r
iptive messa
g
es fo
r
c
o
nflict cases
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik Kuivinen
[PATCH] recursive-merge: Do
n
't
p
rint a
s
t
ack trace
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[P
A
T
C
H] Use
t
he 'die' function wh
e
re
it is appr
o
priate
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivi
n
en
[PATC
H
]
U
s
e a temporary i
n
dex f
i
l
e whe
n
we
m
erg
e
the
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivine
n
[PATCH]
A
d
j
ust git
-
merge-recursive
.
p
y for
t
he new
too
l
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik
Kuivinen
[
PATCH] Don
'
t output 'Aut
o
matic me
r
g
e failed,
.
.
.
'
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[
PATCH] Be more like the 'resolve' strategy
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fr
e
drik Kuivinen
[PATCH] Ren
a
me the 'fred
r
ik'
m
erge
s
trategy to 'recursive'
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
F
r
e
drik
Ku
i
vine
n
[P
A
T
CH] Make the ProgramError class
p
rintable
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Ku
i
vinen
[
PATCH
]
Make sur
e
w
e
die if
we don
'
t
get enough arguments
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik K
u
ivinen
[
PATCH] Introduce
a 'die' function
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
Fredr
i
k
Kuivinen
[PATCH]
Exit with status
c
ode 2 if w
e
get an exception
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
Fredri
k
Kuivi
n
en
[PATCH] Fix assertion failure
w
h
en mer
g
ing common
a
ncestors
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-04
Fredrik Kuivi
n
en
[PATCH
]
M
a
ke git-apply
u
nde
r
stand incomplete lines
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree