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
Documentation: rebase-from-internal minor updates.
2005-11-12
Fredrik Kuivinen
merge-recur
s
iv
e
: Use '~' instead of '_' to
s
eparate
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik
K
uivinen
mer
g
e-
r
ecursive: Add c
o
pyright
notice
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik Kuivinen
merg
e
-recursi
v
e
: Indent th
e
output prop
e
rly
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fredrik Kuivinen
merge-recursive: Fix s
u
pport for
b
ranch n
a
mes containing
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
F
redrik Kuivinen
merge-recursiv
e
: Fi
x
limited outp
u
t o
f
rename messages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-08
Fre
d
rik Kuivinen
merge-
r
ecursive: On
l
y
p
rint relevant rename me
s
sages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-03
Fred
r
ik K
u
ivinen
[PA
T
CH] E
n
able
a
nd fix
s
upport
for ba
s
e less
m
e
r
ges
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik Kuivi
n
en
[P
A
TCH]
T
e
a
ch g
i
t
-
ls-files a
b
out '--'
t
o de
n
ote e
n
d
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik Kuivi
n
e
n
[PATCH]
T
each the recursi
v
e
merge str
a
tegy about renames
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
F
r
edri
k
Kui
v
inen
[PA
T
CH] More descriptive
messages for conflic
t
cases
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik Ku
i
v
inen
[P
A
T
C
H
]
re
c
ursive-m
e
r
g
e: Don't
prin
t
a
stack trace
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fr
e
drik Kuivi
n
e
n
[PATCH] Use
t
he
'
die'
fu
n
ction where it is appropriate
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[PATCH]
U
se a temporary index fi
l
e
when
w
e
merg
e
th
e
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fr
e
drik Kuiv
i
nen
[PATCH] Adjust git
-
merg
e
-recur
s
ive
.
py for the new to
o
l
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredri
k
Kuivinen
[PATC
H
] Don't o
u
tp
u
t '
A
u
t
o
m
a
tic me
r
ge failed,
.
.
.
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredr
i
k
K
uiv
i
nen
[
PATCH]
Be more like th
e
'resolve' st
r
a
tegy
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredr
i
k
K
uivi
n
en
[PA
T
CH]
R
ename th
e
'fredr
i
k' merge strategy to
'
recursive'
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fr
e
drik Kui
v
inen
[PATCH] Make the ProgramError cla
s
s pri
n
table
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
F
redr
i
k Kuivinen
[PATCH] Make sure we
d
i
e
if we d
o
n't
g
e
t
enou
g
h
a
rguments
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[PATCH] I
n
tr
o
duce a 'die' 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 code 2 if
w
e get an excep
t
i
o
n
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivin
e
n
[PATCH] Fix as
s
er
t
io
n
failur
e
when mergi
n
g com
m
on ancestors
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-04
Fre
d
r
ik
K
uivine
n
[PATCH]
M
ake git-ap
p
l
y
und
e
rstand incomplete lin
e
s
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree