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-pull: do not barf on -a flag meant for git-fetch.
2005-10-03
Fr
e
d
rik
Kuivinen
[
PATCH] Enable
a
nd fix supp
o
rt
for base less merges
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fred
r
ik Kuivinen
[PATCH] Teach
g
i
t-
l
s-
f
i
les a
b
out
'--' to d
e
note end
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik Kuivi
n
e
n
[PATCH]
Teach the
r
e
cursive
merg
e
strategy about renam
e
s
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredr
i
k Kuivi
n
e
n
[PA
T
CH] More desc
r
iptive me
s
sage
s
for co
n
flict ca
s
es
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
F
r
edrik Kuivi
n
en
[
P
ATCH] rec
u
rs
i
ve-merge: Do
n
't print a stack trace
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
r
ed
r
ik Kuivinen
[PATCH]
U
se the 'd
i
e' f
u
nction w
h
ere it is
a
ppro
p
riate
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredr
i
k Ku
i
vinen
[PATCH] Use
a
t
e
mporary index
f
ile whe
n
we merge
t
h
e
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fred
r
ik
Kuivinen
[PATCH] Adjust g
i
t-merge-recursive
.
p
y for the
new tool
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik
Kuivi
n
e
n
[PATCH] Don't
o
utput '
A
utomatic merge faile
d
,
.
.
.
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[PA
T
CH] Be m
o
re like t
h
e
'
resolve
'
st
r
ategy
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
r
edrik Kuivine
n
[PATCH] Rename
t
he 'fr
e
dri
k
' merge strategy to 'recur
s
ive'
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivin
e
n
[
P
ATCH] Ma
k
e the Pro
g
ramError class print
a
ble
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
F
redrik Kuivin
e
n
[
PATCH
]
Make
s
u
r
e we die if we d
o
n
't get eno
u
g
h
arguments
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik
K
uivinen
[PATCH] Introduc
e
a 'di
e
' f
u
n
ction
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredri
k
Kuivinen
[PATCH] Exit
with
st
a
tus
code 2 if we get an e
x
cepti
o
n
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
F
redrik Kuivinen
[
P
A
TCH] Fix ass
e
rtion failure when mergi
n
g com
m
on ancestors
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-04
Fred
r
ik Kuiv
i
nen
[PATCH] Make gi
t
-apply understand incomple
t
e lines
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree