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
tag: make it operable from a subdirectory.
2005-11-20
Fredrik Kuiv
i
ne
n
me
r
ge-rec
u
r
s
ive: Repl
a
ce '
e
x
c
ept
:
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik Kuivinen
m
e
rg
e
-
recur
s
ive: Use '~' instead of
'
_' to
separate
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
F
redr
i
k Ku
i
vinen
m
e
rge-recurs
i
v
e
:
A
dd copyr
i
ght noti
c
e
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik Kuivinen
merge
-
recu
r
s
ive: Indent
the o
u
tput properl
y
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fredrik Kui
v
inen
m
erge
-
recursive: Fix
s
upport fo
r
branch na
m
es containi
n
g
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
F
r
edrik Kuivinen
merge-recursiv
e
: Fix li
m
ited output o
f
rename m
e
s
sages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-08
Fred
r
ik
K
ui
v
inen
mer
g
e-recur
s
i
ve: Only print
r
elevant rename mess
a
ges
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-03
Fredrik Kui
v
inen
[
PATCH] Enable and fix support for
base less merges
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik Kuivinen
[PATC
H
] Teach git-l
s
-files abou
t
'--' to denote end
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
F
redrik
K
uivinen
[PATCH] Teach
t
he
r
ecursi
v
e
merge str
a
tegy abou
t
r
e
name
s
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fr
e
drik Ku
i
vinen
[P
A
TC
H
] Mo
r
e
descriptive messages
f
or
c
o
nf
l
ict cases
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fred
r
i
k Kui
v
ine
n
[
P
A
TCH]
recursiv
e
-merge: Don't print a stack t
r
ace
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
r
edrik Kuivinen
[P
A
TCH] Use
the
'
d
ie' f
u
nc
t
ion whe
r
e it is appr
o
pri
a
te
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Ku
i
v
inen
[
P
ATCH] Use a te
m
porary inde
x
file
w
h
e
n we merge th
e
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[PATC
H
] A
d
just git-merge-recursive
.
py for the new tool
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
r
edrik Kuivinen
[
P
ATCH] Don't o
u
t
p
ut 'Automatic me
r
ge
fai
l
ed,
.
.
.
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[PATCH] Be more
l
ike
the 'resol
v
e' str
a
te
g
y
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fr
e
drik Kuivi
n
en
[PA
T
CH] Rena
m
e the 'fredrik' m
e
rge strategy to 'rec
u
rsive'
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[P
A
TCH] Make
t
he ProgramError class p
r
intable
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
F
redrik Kuivin
e
n
[PATC
H
] Make
s
ure we d
i
e if we don't get enough
a
rguments
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
F
redrik Kui
v
i
n
en
[PATC
H
] In
t
rodu
c
e a 'die' funct
i
on
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fred
r
i
k
K
u
ivi
n
en
[PATCH]
E
x
i
t wit
h
status
c
ode 2 if we get an
exc
e
ption
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
F
r
edrik Kuivinen
[PATCH] Fix asser
t
ion failure
when merging com
m
on ancestors
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-04
Fredrik K
u
i
v
inen
[P
A
T
CH] Make
g
it-apply u
n
derstand incomplet
e
lines
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree