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
read-tree: --trivial
2005-10-02
Fredrik Kui
v
inen
[PATCH] Teach
git-ls-files
a
b
o
ut '--' to denote end
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredr
i
k
K
ui
v
in
e
n
[PATCH] Teach the recursive merge s
t
rat
e
gy abo
u
t ren
a
mes
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik
Kuivinen
[PATCH] Mo
r
e d
e
script
i
v
e
messages for conflict cases
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik Kuivinen
[PATCH] rec
u
rsive-
m
e
r
ge
:
Don't print a stack trace
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredr
i
k K
u
ivinen
[PATCH] U
s
e the 'die' fun
c
ti
o
n w
h
ere it i
s
appropriate
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fr
e
drik Kuivine
n
[PA
T
CH] Use a tempora
r
y
i
ndex file w
h
en
w
e merge the
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik
K
uiv
i
n
en
[P
A
TCH] Adju
s
t
git-merge-recu
r
siv
e
.
p
y fo
r
the new tool
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuiv
i
nen
[PATCH]
D
on't output 'Automatic
m
e
r
ge fail
e
d
,
.
.
.
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fred
r
ik
K
ui
v
ine
n
[PAT
C
H] Be mo
r
e li
k
e
t
h
e
'resolv
e
' strate
g
y
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
r
e
drik
K
uivinen
[PATC
H
]
Rename th
e
'
f
redrik' m
e
rge
strategy to 'recursive'
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[PATCH] Make the
P
rog
r
amError
class print
a
ble
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik
Kuivinen
[PATCH] Make sure we die if we d
o
n
't get
enough ar
g
uments
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[PA
T
CH]
Intr
o
duce a 'die
'
funct
i
on
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[PATCH] Exit with stat
u
s c
o
d
e
2
i
f we get an
e
xce
p
ti
o
n
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fr
e
drik Kuivinen
[PATCH] Fix
a
ssertion
f
ailure when
merging common a
n
cesto
r
s
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-04
Fredr
i
k Kuivinen
[PATCH]
M
ake git
-
apply underst
a
nd incomp
l
ete lin
e
s
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree