repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
merge-recursive: Only print relevant rename messages
2005-11-08
Fredrik K
u
ivinen
merge-recursiv
e
: Only pr
i
nt r
e
levant ren
a
me m
e
ssages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-03
Fredrik
Kuiv
i
nen
[PATCH]
Enable an
d
fix
sup
p
or
t
for base less merges
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fr
e
d
r
ik Kui
v
inen
[
PATCH] Teach git-ls-f
i
l
es a
b
ou
t
'-
-
'
to den
o
te
e
nd
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredri
k
Kuivinen
[PATCH] Teach th
e
recursive mer
g
e s
t
ra
t
e
g
y about ren
a
me
s
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik
K
ui
v
inen
[PATCH] More descr
i
ptive mess
a
g
e
s for
c
o
n
f
li
c
t ca
s
es
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik Kuivinen
[
P
A
T
C
H
]
recursive-merge: Don't
p
r
i
n
t
a
sta
c
k
trace
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Ku
i
v
i
nen
[PATCH] Use the
'die' functio
n
where i
t
is
appropriate
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik
Kuivinen
[
P
ATCH] Use a te
m
p
o
r
ar
y
index file
when we merge the
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik K
u
ivinen
[PATCH] A
d
jus
t
git-mer
g
e-recu
r
siv
e
.
py for th
e
new too
l
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[PATC
H
]
Don't out
p
u
t
'Automatic m
e
rge
fail
e
d,
.
.
.
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fre
d
r
i
k Ku
i
vinen
[PAT
C
H] Be m
o
re like
the '
r
e
s
olve'
s
t
r
ategy
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
r
e
drik Kuivinen
[PATCH] Rename the 'fredrik' merge strategy to 're
c
ursive
'
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik
K
u
ivinen
[PATCH] Make the ProgramError class p
r
inta
b
l
e
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik K
u
i
vinen
[PAT
C
H
] Make sure we
die if we don't get en
o
ugh argu
m
ents
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fr
e
drik
K
uivinen
[PATCH] Intro
d
uce a 'die'
func
t
ion
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
F
r
edrik Kuivinen
[PATCH]
Exit
w
it
h
status
co
d
e 2 if we ge
t
an except
i
on
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredri
k
K
u
ivi
n
en
[PATC
H
] F
i
x assertion failure when m
e
rg
i
ng c
o
m
mon ancestors
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-04
Fredrik
K
uivinen
[PAT
C
H] Make git-apply unde
r
st
a
nd incomplete line
s
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree