repo.or.cz
/
git
/
jrn.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.8c
2005-10-03
Fredrik Kuivin
e
n
[P
A
TCH] Enable and fix support for base less
m
erges
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fr
e
drik Kuivinen
[PATCH] Teach git-ls
-
files about '--' to d
e
note end
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik
K
uivin
e
n
[PATCH] Teac
h
the recursive merge s
t
r
a
t
egy a
b
out
re
n
ames
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik Kuivinen
[PATCH] M
o
re
d
e
script
i
ve
m
essages fo
r
con
f
l
i
ct cases
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik Kuivi
n
en
[PATCH] recursi
v
e-merge: Don'
t
pri
n
t a stack
t
rac
e
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik
K
uivinen
[PATC
H
]
Use t
h
e 'die
'
function where
i
t is appr
o
priate
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kui
v
i
n
en
[
P
ATCH] Use a temporary index file
when we merge t
h
e
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[
P
ATC
H
] Adjust git-merge-re
c
ursi
v
e
.
p
y for
t
he
new tool
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
redrik Kuivinen
[PATCH] Don't output 'Auto
m
a
t
ic merge
f
a
iled
,
.
.
.
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fr
e
drik Kuivin
e
n
[PATCH] Be more li
k
e the
'
resolve' s
t
rategy
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[
PATCH]
Rename the
'
fredrik'
m
erge strateg
y
to
'
recu
r
s
ive'
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
F
r
e
d
r
ik K
u
ivin
e
n
[PATCH]
Make the ProgramE
r
ror class p
r
i
n
table
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik K
u
ivin
e
n
[P
A
TCH] Make
s
ure we die i
f
we don
'
t g
e
t enoug
h
argu
m
e
nts
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fre
d
r
i
k Kuivinen
[PAT
C
H
]
Intro
d
uc
e
a 'die' f
u
nction
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik
K
uivi
n
en
[
PATCH] Ex
i
t with stat
u
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
Fre
d
ri
k
K
u
ivin
e
n
[P
A
TCH] F
i
x assertion failure when mergin
g
common anc
e
stors
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-04
Fredrik Kuivinen
[PAT
C
H] Make
g
it-apply understand
i
ncom
p
l
ete
l
in
e
s
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree