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
git-revert: Usage string clean-up
2005-12-14
freku0
4
5@stude
n
t
.
.
.
git-revert: Usage string clean-up
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-12-14
freku045
@
s
t
udent
.
.
.
git-ve
r
i
fy-tag: Usa
g
e string clean-up, emi
t
usag
e
str
i
ng
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-12-14
freku045
@
student
.
.
.
T
r
ivi
a
l
u
sage string clean-up
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-12-14
Fredrik Kuivinen
Usage me
s
sage clean-up,
t
a
ke #2
commit
|
commitdiff
|
tree
2005-12-03
F
redrik
Kuivinen
New t
e
st cas
e
:
Criss-c
r
oss merge
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-12-03
Fredr
i
k Kuivine
n
New test case:
m
erge with
d
i
rectory/fi
l
e conflicts
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Ku
i
vinen
test-li
b
.
sh: Add new function, test_ex
p
ect_code
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Kuivinen
git-merge: Exit wi
t
h cod
e
2 if no stra
t
egy
w
a
s able
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-11-20
Fredrik Kuivin
e
n
merge-recursive: R
e
p
l
ace 'excep
t
:'
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik Kuivinen
merge
-
recursive:
U
s
e '~
'
instead of '_' to separate
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik Kuivinen
merg
e
-
recursi
v
e: Add
co
p
yr
i
ght n
o
tic
e
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik Kuivi
n
e
n
merge
-
recursive:
Indent th
e
outpu
t
pro
p
er
l
y
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-11-09
F
redrik K
u
i
v
inen
merge-recursive: Fix support for branch names containing
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-11-09
Fredrik K
u
iv
i
nen
merge
-
recursive: F
i
x limited output of rename message
s
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-11-08
F
redrik Kuivinen
merge
-
recursive: Onl
y
pr
i
nt relevant rename messages
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-10-03
Fredrik Kuivin
e
n
[PATCH] Enable and fi
x
support fo
r
base less
me
r
ges
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-10-02
Fredr
i
k Kuivinen
[PATCH] Teac
h
git-ls-files
a
bout '--' to d
e
note end
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik
K
uivinen
[
PAT
C
H
] Teac
h
the recurs
i
ve merge strateg
y
about
renam
e
s
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-25
F
r
e
d
r
i
k Kuivinen
[
PATCH]
More d
e
scriptive messages for conflict cases
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik
K
uivinen
[
PATCH]
recu
r
sive-merge: Don't print a
s
tack trace
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kui
v
inen
[PATCH] Use the 'die' functio
n
where it is appropr
i
ate
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
F
r
e
drik Kuivinen
[PATCH
]
Use a t
e
m
porary i
n
de
x
f
ile w
h
en we merge the
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fredr
i
k
Kuivinen
[PATCH] Adjust
git-merge-r
e
cursive
.
py for the new
t
ool
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
F
re
d
rik
Kui
v
inen
[
P
A
T
CH] Don
'
t
o
utput 'Automatic merge failed,
.
.
.
'
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fredr
i
k Kui
v
inen
[PAT
C
H] B
e
more like the
'reso
l
v
e'
s
trat
e
gy
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik
Kuivinen
[PA
T
CH]
R
ename t
h
e 'fredrik
'
merge
s
trategy t
o
'r
e
c
u
rsive'
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[
PATCH]
M
ake th
e
ProgramError class printable
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
Fredri
k
Kuivin
e
n
[PATCH] Make
s
ure we die if
we don't
ge
t
e
nough argum
e
nts
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
Fred
r
ik Kuivi
n
en
[PAT
C
H
] Introduce a 'die' funct
i
on
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
F
r
edrik Kuivi
n
en
[PATCH] Exit with status code 2
if
we ge
t
an exception
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik
K
uivin
e
n
[
P
ATCH] Fix
assertion
f
ailure whe
n
me
r
ging common ancesto
r
s
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-04
Fred
r
ik Kuivinen
[PATCH] Ma
k
e git-apply understand
i
ncomplete lines
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree