repo.or.cz
/
git
/
repo.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
[PATCH] Teach the recursive merge strategy about renames.
2005-10-02
Fred
r
i
k
Kui
v
i
nen
[PATCH] Teach the recursive merge
s
tr
a
t
e
gy about renames
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik
K
uivinen
[PATCH
]
Mo
r
e descriptive messages
f
or con
f
lic
t
cases
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fred
r
ik Kuivi
n
en
[PATCH]
r
e
cursive-m
e
rge: Do
n
't print a stack
t
race
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredr
i
k Kuivinen
[PATCH] Use
t
he
'
die
'
function
w
here it is appropriate
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[
P
AT
C
H] Us
e
a temp
o
rary index file when we merge the
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
redrik
K
uivi
n
en
[P
A
T
C
H]
A
djust git
-
m
erge-recursive
.
py for t
h
e new tool
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredr
i
k Kuivinen
[PATCH] Don
'
t ou
t
put 'Automatic merge
f
ailed,
.
.
.
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik K
u
i
v
i
n
en
[PAT
C
H] B
e
mo
r
e
like t
h
e 're
s
olve'
strategy
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[PATCH] Rename the
'
f
redrik' merg
e
st
r
ategy to 'rec
u
rsive'
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
F
redri
k
K
u
ivi
n
e
n
[PATCH] Make the Progra
m
E
r
ror class
prin
t
able
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik
K
uivinen
[PATCH] Make sure we di
e
if we don't get enou
g
h
arguments
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fred
r
i
k Kuivine
n
[PATCH] Introduce a 'di
e
' f
u
n
c
tion
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[
PATCH] E
x
i
t
with s
t
atu
s
code 2 if
w
e get
a
n exception
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
F
r
e
drik Kuivinen
[
PATCH] Fix
a
ssertion f
a
i
lure w
h
en merging
c
ommon ances
t
ors
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-04
Fredrik
K
uivin
e
n
[PATCH] Make git-apply understand incomplete lin
e
s
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree