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
Trivial usage string clean-up
2005-12-14
f
r
ek
u
045@student
.
.
.
Trivial
usage string clean-up
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-12-14
Fredrik Kui
v
inen
Usa
g
e mess
a
ge
c
lean-up
,
take #2
commit
|
commitdiff
|
tree
2005-12-03
F
redr
i
k Kuivinen
New test case: Criss-cross me
r
ge
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik K
u
ivinen
Ne
w
test cas
e
: merge wit
h
directory/f
i
l
e
conflicts
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-12-03
F
redrik Kuivinen
tes
t
-lib
.
s
h: Ad
d
ne
w
f
unction,
te
s
t_expect_code
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik
Kuiv
i
nen
g
i
t
-
me
r
ge: Exit with code 2 i
f
no strategy was able
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-11-20
Fredrik Kui
v
inen
merge-re
c
u
r
sive: Replace 'exce
p
t:
'
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik Kuiv
i
n
en
merge-recursi
v
e: Use '~' instead o
f
'
_' to sep
a
r
a
t
e
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-11-12
Fre
d
rik Kuiv
i
n
en
merg
e
-recursive: Add copyright notice
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-11-12
Fred
r
i
k Kuivinen
merg
e
-recursive: Inde
n
t
t
h
e
outp
u
t
p
r
operly
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-11-09
Fred
r
i
k
K
u
ivin
e
n
merge-
r
ecursi
v
e: Fix support f
o
r branch names containing
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-11-09
F
r
edrik Kui
v
in
e
n
m
e
rg
e
-
recu
r
s
ive: Fix limited output
o
f rename messages
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-11-08
Fre
d
rik Kuivine
n
me
r
ge-
r
ecursive: Only p
r
int relevant re
n
ame messages
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-10-03
Fredri
k
Kuivinen
[PATCH] Enab
l
e and
fix
s
upport for bas
e
less
merges
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-10-02
Fr
e
drik
K
uivinen
[PATCH] Tea
c
h git-l
s
-fil
e
s
about '--' to denote
e
n
d
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik K
u
i
vinen
[PATCH] Teach th
e
re
c
ursive merge strategy a
b
o
ut renames
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-25
Fre
d
rik K
u
i
v
ine
n
[PATCH] More
d
e
scriptive messages for con
f
lict cas
e
s
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-25
F
redrik Kuivi
n
en
[PAT
C
H] recursive-m
e
rge:
D
o
n't print a
stack trace
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fredri
k
K
uivinen
[PAT
C
H] Use
t
h
e 'die' function where
it is appro
p
riate
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[PATCH] Use a temporary index file when we merg
e
the
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fr
e
drik Kuivinen
[PA
T
CH] Adjus
t
git-merge-recursiv
e
.
p
y for the new
t
ool
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[PAT
C
H] Don't output 'A
u
toma
t
ic merge failed
,
.
.
.
'
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
F
r
e
dr
i
k
Kuivinen
[PATCH] Be m
o
re l
i
ke th
e
'resolve
'
strat
e
gy
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fredr
i
k Kuivinen
[PATCH]
R
ename the 'fredri
k
' merge
s
t
ra
t
egy to 'r
e
c
ursi
v
e'
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
F
r
edr
i
k Kui
v
inen
[PATCH] Make t
h
e
ProgramError
c
lass
p
rintable
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
Fr
e
drik Kuiv
i
nen
[
P
ATCH] Make sure we die if
we d
o
n
't get en
o
ugh argument
s
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuiv
i
nen
[P
A
TCH] Intr
o
duce
a
'd
i
e'
function
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
Fre
d
rik Ku
i
v
inen
[PATCH] Exit with status
c
ode
2
if we g
e
t an excep
t
ion
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
Fredr
i
k Kuivinen
[
P
ATCH] F
i
x
a
s
ser
t
ion failure w
h
en mergin
g
common ances
t
ors
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-04
Fredrik
Kuivin
e
n
[PAT
C
H
] Make git-apply und
e
rstand inc
o
m
p
lete lines
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree