repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
GIT 0.99.8f
2005-10-03
Fredrik Kuivin
e
n
[PATCH] Enable and fix su
p
port for
b
ase
l
ess
m
erges
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik Kuivinen
[P
A
TCH]
T
each
g
it-ls-files a
b
out '--'
t
o denote end
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik Kuivinen
[PATCH] T
e
a
ch the
recursive mer
g
e s
t
r
ategy about renames
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fre
d
ri
k
Kuivi
n
en
[PATCH] More descriptive messages for conflict cas
e
s
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredr
i
k
Kuivinen
[
P
AT
C
H
]
rec
u
r
sive-
m
e
r
ge: Don't print a sta
c
k
t
race
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fre
d
rik Kuivine
n
[PA
T
CH]
Use the 'die
'
fu
n
ction wher
e
it is
a
p
propriate
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
redrik Kui
v
inen
[PATCH] Use
a
temporar
y
index
file when we m
e
rge the
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredr
i
k Kuivinen
[
P
AT
C
H] A
d
just git-
m
erge-recursive
.
py
f
or the new tool
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredri
k
Kuivine
n
[PATCH]
D
on't
out
p
ut 'A
u
to
m
atic merge f
a
iled,
.
.
.
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fre
d
rik Kui
v
i
nen
[PATCH] Be mor
e
like
t
he 'resolve' strate
g
y
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
redrik Kuivinen
[PATCH] Rename t
h
e 'f
r
e
d
r
ik' m
e
rge st
r
ateg
y
t
o 'recur
s
ive'
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[PA
T
CH] Make the ProgramError clas
s
printable
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fre
d
rik Kuivinen
[PATCH] M
a
ke sure we die i
f
we don't get e
n
ough argumen
t
s
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fr
e
drik Kuivinen
[
P
ATCH] Introdu
c
e a '
d
ie' function
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik
K
uivinen
[PATCH] Exit
w
it
h
stat
u
s code 2
i
f we ge
t
an
e
xception
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[
P
AT
C
H]
Fix as
s
ertion failure when merging common ancestors
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-04
F
r
edri
k
Kuivinen
[PATCH] Make gi
t
-apply understand inc
o
mplete lines
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree