repo.or.cz
/
git
/
jnareb-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
fmt-merge-msg: show summary of what is merged.
2006-02-02
Fre
d
rik Kuivinen
merge-recu
r
si
v
e
: Speed u
p
c
o
mm
i
t graph
c
o
ns
t
ruc
t
ion
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-02
Fredrik Kuivi
n
en
merge-recu
r
sive: Make
u
se o
f
p
r
ovid
e
d b
a
ses
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
Fr
e
drik Kuivinen
gi
t
-branc
h
: Document
a
t
ion
f
ixes
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
Fredr
i
k K
u
ivine
n
mer
g
e-recurs
i
ve: Imp
r
o
v
e
the error
m
essa
g
e
p
rin
t
e
d
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
F
r
edrik Kuivinen
git-wha
t
changed: Add
usage string
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fredrik Kuivinen
git-lo
g
: A
d
d
u
s
age string
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fredrik Ku
i
vinen
gi
t
-
diff: Usage stri
n
g clea
n
-up
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-14
F
r
edr
i
k
Kuivinen
Usage message
clean-up, take #2
commit
|
commitdiff
|
tree
2005-12-03
Fredrik
Kuivinen
New
tes
t
case: Cri
s
s-cross m
e
rge
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fre
d
rik Kuivinen
Ne
w
t
e
st case:
merge with directory/file conf
l
i
c
t
s
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Kuivinen
test-lib
.
sh:
A
dd n
e
w f
u
nction, t
e
st_
e
xpec
t
_code
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredri
k
K
u
ivinen
g
it-merge: Exit w
i
th cod
e
2 if no strategy
was
able
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-20
Fredrik Kuivinen
m
erge-recursive:
R
eplace 'excep
t
:'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik
K
uivinen
merge-r
e
c
u
rsive: Use
'~' instead o
f
'
_
' to se
p
arate
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredr
i
k
Ku
i
v
i
nen
m
erge-
r
ecursive:
A
dd copy
r
ight
n
otice
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik
Kuiv
i
nen
merge-recursive: Ind
e
nt
t
he
o
utpu
t
p
r
operly
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fr
e
drik
Kuivinen
merge-recursi
v
e: Fix su
p
po
r
t for branch
n
ames containing
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fredrik Kuivi
n
en
mer
g
e-
r
e
c
u
r
s
i
ve:
F
ix limited o
u
tput o
f
r
e
name messages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-08
Fredrik Kuivinen
merge-recurs
i
ve: Only print relev
a
nt rename mess
a
ges
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-03
Fredrik Kuivinen
[PATCH] Ena
b
le and
fix sup
p
or
t
fo
r
b
a
se less
merge
s
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredr
i
k
Kuivinen
[PATCH] Tea
c
h g
i
t-
l
s
-
f
iles abo
u
t
'
-
-' to
denot
e
end
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fre
d
r
i
k Kui
v
inen
[PATCH] Teach the recursive
m
er
g
e stra
t
e
g
y
about renames
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fr
e
drik Kuivinen
[PATCH] Mo
r
e
de
s
criptive messages for co
n
flic
t
cases
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik
K
uivi
n
en
[
PATCH]
r
e
c
ursive
-
m
e
rg
e
:
D
on'
t
p
r
int
a
stack trace
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[PAT
C
H] Use th
e
'die
'
function
where it is appropr
i
ate
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
r
edrik
K
uivinen
[PATCH] Use a tempora
r
y
i
n
dex file when we merge the
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[
PATCH] Adjust git-merge-recur
s
ive
.
py for
t
he
n
ew t
o
ol
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredri
k
Ku
i
vinen
[PATCH] Don't outp
u
t
'Automatic merg
e
fai
l
e
d
,
.
.
.
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Ku
i
vinen
[PATCH] Be more
l
ike the 'resolve' strategy
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
redrik Kuivinen
[PATCH] Rename the 'fredrik' merge strategy to 'recur
s
iv
e
'
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredri
k
Kui
v
inen
[
P
AT
C
H] Make the
P
rogramError
c
lass printable
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredr
i
k Kuivin
e
n
[PATCH] Make
sure we
die if
w
e don't get
e
nough
a
r
g
uments
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[PATCH] Introdu
c
e a 'die' funct
i
on
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik
K
uivinen
[PAT
C
H] Exit with status code 2
if we g
e
t an exception
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
F
r
edrik Kuivin
e
n
[PATCH] Fix assertion failure w
h
en merging common
ancestors
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-04
Fre
d
r
i
k Kuivin
e
n
[
P
A
TCH] Make gi
t
-apply understand incomplete lines
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree