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
Update howto using-topic-branches
2005-11-08
Fredri
k
Ku
i
vinen
merg
e
-recursive: Onl
y
print
rel
e
v
a
nt rename m
e
ssages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-03
Fredrik Kuiv
i
nen
[PATCH]
Enable
a
nd f
i
x sup
p
ort for base less
merg
e
s
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
F
redrik Kuivinen
[PATCH] Teach
g
it-ls
-
fil
e
s abou
t
'
-
-
' to denote
e
n
d
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
F
r
edrik Kuivinen
[PATCH] Teach the recu
r
sive
m
er
g
e
s
trat
e
gy about re
n
am
e
s
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
F
r
edrik Kuivinen
[PATC
H
] More descriptive messages for conflict case
s
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fre
d
r
ik Kuivin
e
n
[PATCH]
r
ecur
s
ive-merge: Don
'
t p
r
int
a stack
trace
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fr
e
drik Kuivinen
[PATCH
]
Use t
h
e 'die' funct
i
on w
h
ere
it is appr
o
priate
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
r
e
drik Kuivin
e
n
[PATCH
]
Use
a
temporary i
n
dex fil
e
when w
e
merge the
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
r
edrik
K
uivinen
[PAT
C
H
]
Adjust git-me
r
ge-recur
s
ive
.
py
for t
h
e new tool
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fre
d
rik Kuivine
n
[PA
T
CH] Don't ou
t
put 'A
u
tomat
i
c merge failed
,
.
.
.
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivi
n
e
n
[PATCH] Be more l
i
ke th
e
'r
e
solve' strateg
y
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
r
e
d
rik
K
u
i
vinen
[PATCH] Re
n
ame th
e
'fr
e
d
rik' mer
g
e strat
e
gy to 'recursive'
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
F
r
e
d
ri
k
K
uivinen
[PATCH]
M
ake the Progr
a
mError class pri
n
t
able
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivin
e
n
[PATCH] Make
s
ure we die
i
f we don't ge
t
en
o
ugh arg
u
ments
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivine
n
[
P
ATCH] Introduce a 'die' fu
n
ction
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredr
i
k Kui
v
inen
[PA
T
CH] Ex
i
t with status code 2 if we get an
e
x
ception
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
F
r
edrik
K
u
i
v
inen
[PAT
C
H] Fix asser
t
ion failure
w
hen mer
g
ing common ancestors
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-04
F
redrik
K
u
i
vinen
[
PATCH] M
a
ke gi
t
-
apply understand incomple
t
e line
s
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree