repo.or.cz
/
git
/
mingw
/
j6t.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
diff-index: make --cc a synonym for -p for now.
2006-02-02
Fredrik Kui
v
inen
merge-recu
r
sive: Speed up c
o
mm
i
t graph con
s
t
r
uction
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-02
Fredrik Kuiv
i
ne
n
m
erge-recur
s
i
ve: Mak
e
use of prov
i
d
e
d bases
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
Fredrik
Kuivinen
g
i
t-branch: Documen
t
atio
n
f
i
xe
s
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
F
r
edrik
K
u
ivinen
m
erg
e
-recursive:
I
mprove t
h
e error message prin
t
e
d
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fredrik
Kui
v
i
n
en
g
it-whatch
a
n
g
e
d
: Add usage strin
g
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fredr
i
k Kuiv
i
nen
git-log: A
d
d usage st
r
ing
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fredrik Kuivinen
git-di
f
f: Usage
s
t
r
ing clean-up
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-14
Fred
r
ik Kuivinen
Usage m
e
ssage clean-u
p
, take
#2
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Kuivine
n
New test ca
s
e:
Cri
s
s-cro
s
s merge
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
F
r
edrik K
u
i
v
inen
N
e
w t
e
st
case:
m
e
r
ge
with directory/file conf
l
icts
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Ku
i
vinen
test-lib
.
s
h
: Add new function,
t
est_expect_code
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fre
d
rik Ku
i
v
i
nen
git-merge: E
x
it with co
d
e 2 if no s
t
rategy was a
b
le
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-20
Fred
r
ik Ku
i
vi
n
e
n
m
e
rg
e
-recursive
:
Replace
'except:'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredr
i
k Ku
i
vinen
merg
e
-recur
s
i
ve: Use '~' instead
o
f '
_
'
to sep
a
rate
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fre
d
rik Kuivi
n
en
merge-recu
r
s
ive:
Add copyright notice
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik
K
uivinen
merge-re
c
ursive: Ind
e
n
t
the
outpu
t
pr
o
perly
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fredrik
Ku
i
vine
n
m
e
r
g
e-recursive: Fix support for branch n
a
mes contain
i
n
g
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fredrik Kuivinen
merge-recursive: Fix limi
t
e
d
output of rename messages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-08
Fredri
k
Kuivinen
m
e
rge-re
c
ursi
v
e:
Only print relevant renam
e
m
essages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-03
Fre
d
rik Kuivinen
[PATCH] Enable and fix
s
upport f
o
r
base les
s
merges
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fred
r
ik Kui
v
inen
[PAT
C
H]
T
e
a
ch git-ls-files
a
bout '--'
to denot
e
end
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik Kuivine
n
[
PATC
H
] Teach t
h
e recursi
v
e merge strategy about renames
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik
K
uivinen
[PATC
H
] More descript
i
ve mess
a
ges
for conf
l
ic
t
cases
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fre
d
rik Kuivinen
[
PATCH
]
recursive-merge: Don't print a
stack tra
c
e
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[P
A
TCH] Use the 'd
i
e'
functi
o
n where it
i
s appropriate
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fred
r
ik Kuivine
n
[PATCH] Us
e
a tem
p
orar
y
index
f
i
le when we merge the
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fred
r
ik Kuivinen
[
P
ATCH] Adjust
gi
t
-merg
e
-recursive
.
py for t
h
e
new tool
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kui
v
inen
[
P
ATCH] Don't outp
u
t
'
A
u
tomat
i
c merge
failed,
.
.
.
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fred
r
ik Kuivinen
[PA
T
CH] Be mor
e
lik
e
the 'resolve' st
r
a
t
e
gy
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuiv
i
nen
[P
A
TCH] Renam
e
the
'
fredrik' merge strategy to 'recursi
v
e'
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik K
u
ivinen
[P
A
TCH
]
M
ake the P
r
og
r
amError cla
s
s printable
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuiv
i
n
en
[PATCH] Make sure we die if we
d
o
n't get en
o
ugh arg
u
m
e
nt
s
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fre
d
r
i
k K
u
i
v
i
nen
[PATCH] Int
r
o
d
uce a 'die' f
u
ncti
o
n
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik
Ku
i
v
inen
[
P
ATCH]
E
xit
with status code 2 i
f
w
e get
a
n exception
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Ku
i
vinen
[
PAT
C
H] Fix assertion failure when merging co
m
m
o
n ancestors
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-04
F
redrik Kuivinen
[PAT
C
H
] Make
g
it-apply underst
a
nd incomplet
e
lines
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree