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
Tutorial: adjust merge example to recursive strategy.
2005-11-20
Fredrik Kuivin
e
n
m
e
rg
e
-recursive: Re
p
lace
'
e
xcept:'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fre
d
r
i
k Kuivinen
m
e
r
g
e
-
r
ecursive:
Us
e
'~' in
s
tead of
'
_' to sep
a
rate
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fred
r
ik Kuiv
i
nen
me
r
ge-recur
s
ive: Add c
o
pyr
i
ght not
i
ce
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredri
k
Kuivinen
merge-recurs
i
ve: In
d
ent the output pr
o
perly
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fredrik Ku
i
vinen
mer
g
e-recursiv
e
: F
i
x
s
uppo
r
t
for branch name
s
c
ontai
n
i
n
g
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fredrik Kuivinen
me
r
ge-re
c
ursive: Fix limited output o
f
rename messages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-08
Fredr
i
k
Kuivinen
m
erge-
r
ecurs
i
ve: Only pri
n
t rel
e
v
ant rename messages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-03
F
redrik Kuivinen
[PATCH] Enable and fix support for bas
e
le
s
s
merges
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik Kuivinen
[PATCH] Teach git-ls-files ab
o
ut '--' to denote end
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik Kuivine
n
[PATCH] Teach th
e
recur
s
ive me
r
ge strategy about renames
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fr
e
drik Kuivinen
[
PATCH] More descr
i
ptive messa
g
es fo
r
c
o
nflict
c
ase
s
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredr
i
k Kuiv
i
n
en
[PATC
H
] recursive-merge: Don't print a sta
c
k
t
race
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[P
A
TCH] Use
t
he 'die' fu
n
ction wh
e
re it is a
p
propriate
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
r
edrik Kuivinen
[PATCH]
U
se a
te
m
porary
i
nd
e
x file wh
e
n
we merge the
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
redr
i
k
K
uivinen
[PATCH] Ad
j
ust g
i
t
-merge-recursive
.
py for the new to
o
l
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fred
r
ik Kui
v
inen
[PAT
C
H
]
D
o
n't output 'Automat
i
c merge fail
e
d,
.
.
.
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredri
k
Kuivinen
[P
A
TCH] Be more like the
'
r
e
solve
'
strategy
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
r
e
drik
Kuivinen
[PAT
C
H]
R
ename the '
f
r
e
drik' merge str
a
tegy to
'
recursive'
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fre
d
r
ik Kuivinen
[PATCH] M
a
ke t
h
e
P
rogramError c
l
ass printabl
e
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kui
v
inen
[
P
A
TCH]
M
ake sure we d
i
e i
f
we don't get enou
g
h
a
r
guments
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[PATCH] Introduce a 'die' function
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[
P
ATC
H
] Exi
t
with st
a
tus cod
e
2 if we get a
n
excepti
o
n
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fr
e
dri
k
Ku
i
vinen
[PATCH] Fix asser
t
ion f
a
il
u
re when
m
e
r
ging
c
ommo
n
anc
e
s
t
ors
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-04
F
redrik Kuivinen
[
P
ATCH] Make git-apply underst
a
nd inc
o
mplete lines
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree