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-verify-tag: Usage string clean-up, emit usage string at incorrect invocation
2005-12-14
f
r
eku045
@
student
.
.
.
git-verify-tag: Usage string clean-
u
p, emit usage s
t
ring
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-12-14
freku
0
45@student
.
.
.
Trivia
l
usage s
t
r
ing c
l
ean
-
up
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-12-14
Fre
d
rik Kuivine
n
Usage message c
l
ean-up
,
t
a
k
e
#2
commit
|
commitdiff
|
tree
2005-12-03
Fredr
i
k Kuivinen
New
test
case: Criss-cross m
e
rge
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-12-03
Fre
d
rik Kuivinen
New t
e
st case: mer
g
e w
i
th directory/file conflicts
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik K
u
iv
i
n
e
n
test-
l
ib
.
s
h:
Add new function,
t
es
t
_expect
_
code
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-12-03
Fr
e
drik
K
uivinen
git-merge: Exit w
i
th
c
od
e
2 if no str
a
tegy was able
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-11-20
Fredrik Kuiv
i
nen
m
e
rge-recursi
v
e
:
R
eplace
'except:'
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik
Ku
i
vinen
m
er
g
e-recursive
:
U
s
e '~' instead o
f
'_'
to s
e
parat
e
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-11-12
Fr
e
drik Ku
i
vinen
me
r
ge-recu
r
sive: Add copyrigh
t
no
t
ic
e
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik Kuivinen
merge-recur
s
ive:
I
ndent the
output
p
r
o
p
e
rly
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-11-09
Fr
e
drik
Kuivinen
merge-recursive: F
i
x
s
u
pport
f
or branch name
s
containing
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-11-09
F
redrik Kui
v
inen
merge-r
e
cursive
:
Fix
l
i
m
i
ted output of ren
a
me messages
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-11-08
Fre
d
rik Kui
v
inen
merge-r
e
curs
i
v
e: Only pr
i
nt r
e
levan
t
rename me
s
s
a
ges
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-10-03
Fr
e
drik Kuivinen
[PA
T
CH] Enable and f
i
x support for base le
s
s merges
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-10-02
Fre
d
rik Kuiv
i
nen
[PATCH] Teach git-ls-files about '--
'
to denote end
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik Kuivi
n
e
n
[PATCH] Teach the recursiv
e
merge st
r
ateg
y
a
b
o
ut
r
enames
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik
Kuivinen
[P
A
T
C
H] More
descri
p
t
ive m
e
s
s
ages for confl
i
ct
c
ases
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-25
Fr
e
drik Kuivinen
[PATCH] rec
u
rsive-merge: Don't print a stack tra
c
e
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fre
d
rik K
u
i
vine
n
[
P
A
T
C
H
]
U
s
e
the 'di
e
' function where it i
s
appr
o
priate
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fr
e
drik K
u
ivinen
[PATCH] Use a
temporary index file wh
e
n we me
r
ge the
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[PATCH] Adjust git-merge-
r
ecurs
i
ve
.
py f
o
r
the new tool
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kui
v
inen
[
PATCH] D
o
n't output 'Automatic merg
e
f
ailed,
.
.
.
'
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik
K
ui
v
inen
[PATCH
]
Be m
o
r
e
like the 'resolve' strategy
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[PA
T
CH] Rename the
'
fredrik' merge strat
e
gy to 'recursive'
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
Fredri
k
K
uivinen
[PATCH] Make t
h
e
Pro
g
ramError class printab
l
e
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
F
red
r
ik K
u
ivinen
[P
A
T
CH] M
a
ke sure w
e
die if we don't get enough arguments
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
Fredri
k
K
uivin
e
n
[P
A
TCH]
I
ntrodu
c
e a
'
die
'
funct
i
on
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
F
r
edrik Kui
v
inen
[PATCH] Exit w
i
th sta
t
u
s
c
ode 2
i
f
we
g
e
t an
e
xce
p
tion
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
Fre
d
rik Kuivinen
[PATCH]
Fix
a
s
serti
o
n fa
i
lure when merging common
a
ncesto
r
s
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-04
Fredrik K
u
ivin
e
n
[PATCH] Make git-apply und
e
r
s
tan
d
incomp
l
ete lin
e
s
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree