repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
[PATCH] Teach git-ls-files about '--' to denote end of options.
2005-10-02
Fred
r
ik
K
uivinen
[PATCH] Teach gi
t
-ls-files
a
bou
t
'--' t
o
denote
e
nd
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik Kuivinen
[
P
ATCH]
T
e
ach t
h
e recursive merg
e
strategy about renam
e
s
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-25
F
r
edrik Kuivinen
[
P
ATCH] More descriptive m
e
ss
a
ges for confli
c
t cases
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik Kuivinen
[
P
ATCH]
r
ecursive-m
e
rge: Don't
p
rint a
s
tack
trace
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik K
u
ivi
n
en
[PA
T
CH]
U
se the
'die
'
function
wh
e
re it is appropriate
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fredr
i
k Ku
i
vinen
[P
A
T
CH] Use
a
tempor
a
ry in
d
ex file when we merge the
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fred
r
ik Kuivinen
[PATCH
]
Adjust g
i
t-
m
erg
e
-recur
s
ive
.
p
y for the new to
o
l
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kui
v
inen
[PATCH]
Do
n
't
output
'
A
utomatic m
e
rge failed,
.
.
.
'
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[PA
T
C
H
]
Be more lik
e
th
e
'res
o
lve' stra
t
egy
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fredri
k
Kuivinen
[PATCH]
Rename
the
'
fred
r
ik' m
e
rge st
r
ategy to 're
c
ursive'
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
F
redrik
K
uivinen
[
P
ATC
H
] Make the Pr
o
g
ramE
r
ror class
p
rintab
l
e
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
F
r
edrik Kuivin
e
n
[PA
T
CH] Make
s
ure
we
die if we don
'
t get en
o
ugh a
r
g
u
ments
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
Fre
d
rik Kuivinen
[PATC
H
]
Int
r
oduce a 'die' function
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[PATCH] Exit w
i
th status code 2
i
f we get an exception
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik
Kuivinen
[PATCH]
F
ix a
s
s
e
rtion failure
when mergi
n
g
c
o
m
mon anc
e
s
tors
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-04
F
redrik Kuivinen
[P
A
T
C
H] Mak
e
gi
t
-
app
l
y understand incomplete lines
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree