repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Usage message clean-up, take #2
2005-12-14
Fredrik Ku
i
v
i
nen
Usage message clea
n
-up
,
take
#
2
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Kuivinen
N
ew test
c
ase:
Criss
-
cr
o
ss
m
erge
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Kuivine
n
New
t
est case: mer
g
e with directory/file conf
l
icts
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fre
d
rik Kuivinen
test-l
i
b
.
sh: Add
new func
t
ion,
test_expect
_
c
o
de
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fr
e
drik Kuivinen
git-me
r
ge
:
Exit wi
t
h code
2
i
f no strateg
y
was able
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-20
Fredrik
K
uivinen
merge-
r
ecursive
:
Replace 'exce
p
t:'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik
Kuivinen
m
erge-rec
u
r
s
i
v
e:
U
s
e '~' in
s
tead of
'_'
to separ
a
t
e
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fr
e
d
r
ik Kuivinen
mer
g
e-recursi
v
e: Add copyright notice
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredr
i
k Kuivinen
merge-recursive
:
I
ndent the output
properly
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fre
d
rik Kuivinen
merge-
r
ecursive: Fix s
u
pport f
o
r branch
names contain
i
ng
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
F
r
edrik
K
uivinen
merge-recursive:
Fix limi
t
e
d
output of re
n
ame messa
g
es
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-08
Fredrik Kuivi
n
en
merg
e
-recursive: Only pri
n
t relevant rename messag
e
s
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-03
F
r
edrik Kuivinen
[PATCH] En
a
ble
and fix sup
p
o
r
t for base less merges
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik
K
uiv
i
n
e
n
[P
A
TC
H
] Teach git-ls-files about
'
--' to denote end
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
F
redrik Kuivine
n
[PATC
H
] Teach
t
he
r
e
cursive merge st
r
ategy about re
n
ames
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
F
r
edrik Kuivinen
[PATCH] More d
e
scriptive messa
g
es for conflict
c
as
e
s
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredri
k
Kuivi
n
en
[PATCH]
recursive-merg
e
: Don't prin
t
a stack tra
c
e
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredri
k
K
u
iv
i
nen
[PATCH] Use
the 'die' functi
o
n where i
t
is ap
p
r
o
priate
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik
K
uivinen
[P
A
TCH] Use a
t
e
mpo
r
ary inde
x
file wh
e
n we m
e
rge the
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fre
d
rik Kuivi
n
en
[
PATCH] Adjust git-
m
erge-r
e
cursi
v
e
.
py for the new t
o
ol
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fred
r
ik Kuivine
n
[PATCH] Don't ou
t
put 'A
u
tomati
c
merge failed,
.
.
.
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[
P
ATC
H
] Be
more
l
ike the 'resolve' st
r
ategy
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik
Kuivinen
[PATCH]
Rename th
e
'
f
r
edrik' merge st
r
ateg
y
to
'
recurs
i
ve'
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredr
i
k Kuivinen
[PATCH] Make
t
he ProgramError cla
s
s
printable
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fred
r
ik Kuivinen
[PA
T
CH]
Make sure we die if we do
n
'
t
g
et enough a
r
guments
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[PATCH]
I
ntro
d
u
ce a
'di
e
'
f
unction
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Ku
i
vinen
[PATCH] Ex
i
t
with
status code 2 if w
e
get
a
n
e
x
cepti
o
n
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredri
k
K
uivinen
[PATCH]
F
i
x
assertion failure when merging
c
o
mmon
a
ncestors
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-04
F
r
edr
i
k Kuivinen
[
P
ATCH] Make git
-
ap
p
ly underst
a
nd inc
o
mplete lines
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree