repo.or.cz
/
git
/
wpalmer.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'jc/clone' into next
2006-03-18
Fred
r
i
k K
u
ivinen
Makefile: Add TAG
S
and tags
t
argets
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-17
Fredrik Kuiv
i
n
en
b
l
a
me:
F
i
x
git
-
blame
<direc
t
ory>
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-17
F
r
edrik
K
uivinen
bla
m
e:
N
ice
r
o
u
tpu
t
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-11
Fredrik Ku
i
vine
n
blame: Renam
e
detection
(
t
a
k
e 2)
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-11
Fr
e
d
r
i
k
Kuivinen
rev-
l
i
b
: Make
i
t easy to do rename
tracking
(
take 2)
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-11
Fredrik Kuivinen
Ma
k
e
it possible
t
o no
t
clobber object
.
util in sort_in_topol
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-09
Fr
e
d
r
ik
Kuivinen
Nicer output from 'g
i
t'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-09
Fred
r
ik
Kuivinen
R
e
m
o
ve t
r
ailing d
o
t
after s
h
ort descri
p
tion
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-09
Fr
e
drik Kuivinen
Fix
some inconsistencies in
th
e
d
o
cs
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-06
Fr
e
d
rik Kuivinen
gi
t
-
b
l
a
me: Use the sa
m
e tests
for gi
t
-bla
m
e
a
s
f
or
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-05
Fredrik Kuivinen
gi
t
-blame: Ma
k
e the output human reada
b
le
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-02
F
re
d
r
i
k Kuivinen
git-b
l
ame, take
2
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-21
Fre
d
r
ik Kui
v
inen
A
d
d gi
t
-
b
l
a
me, a too
l
f
o
r assigning blame
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-14
Fredrik
K
uivin
e
n
s/S
H
E
LL/SHELL_PATH/ in Makefile
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-02
F
r
edrik Kuivinen
merge-recurs
i
ve: Spe
e
d up
c
ommit gra
p
h
con
s
truction
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-02
Fr
e
drik
K
u
ivinen
me
r
ge-
r
ecursive
:
Make use of provided bases
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
Fredrik Kuivin
e
n
git-branch: Docume
n
t
a
t
i
on
fi
x
es
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
Fred
r
ik K
u
ivinen
me
r
ge-recursive: Improve the error
message
p
rinted
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fredr
i
k
Kuivinen
g
i
t-whatcha
n
ged
:
Add usage s
t
ring
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fredr
i
k Kuivi
n
en
git-log: Ad
d
u
s
age str
i
n
g
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fredrik Kuivinen
git-di
f
f: Usage st
r
i
ng
clean-up
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-14
Fredrik
Kuivin
e
n
U
s
age message cl
e
an-up, take #2
commit
|
commitdiff
|
tree
2005-12-03
Fredr
i
k Ku
i
v
i
nen
N
ew te
s
t case
:
Criss-cross merge
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Kuivinen
N
ew te
s
t cas
e
: merge with directory/file confli
c
t
s
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredr
i
k
Ku
i
vinen
test-lib
.
s
h: Add new function
,
test_expect
_
co
d
e
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredr
i
k K
u
ivinen
g
i
t-me
r
ge: Exi
t
with cod
e
2 if no strate
g
y wa
s
able
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-20
Fredrik
K
u
ivinen
merg
e
-re
c
ursive: Replace 'except:'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik Kuivi
n
en
m
erge-recursive: Use '~' instead of '_' t
o
sepa
r
ate
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik Ku
i
vi
n
e
n
merge-rec
u
rs
i
ve: Add copyright
n
otice
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik K
u
ivinen
merge-r
e
c
ursive: In
d
e
nt
t
he outp
u
t properly
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
F
r
edrik Kuivinen
merge-r
e
cursive: Fix su
p
port for branch names
c
o
n
tai
n
ing
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fredrik Kuivinen
merge-recursive: Fix
l
imite
d
ou
t
put of
r
enam
e
messa
g
es
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-08
Fred
r
ik
Kuivin
e
n
merge-recur
s
iv
e
: Only
p
rin
t
re
l
ev
a
nt
rename messag
e
s
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-03
Fredrik Kuivinen
[
PATCH] Enable and fix support f
o
r
bas
e
less merges
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
F
r
edrik Kui
v
i
nen
[PATCH]
Teach
g
it-ls-file
s
abou
t
'
-
-' to denote end
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik Kuivinen
[PATCH] Teach the recursive merg
e
st
r
a
t
e
gy about renames
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik Kuivinen
[
P
A
TCH]
Mor
e
descriptiv
e
m
e
s
sages for conflict cases
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
F
r
edrik Kuivinen
[PATCH] recursive-merge:
Do
n
't print
a
stack trace
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[
P
ATCH] Use the 'di
e
' fu
n
ctio
n
w
here it
is appr
o
pr
i
ate
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredri
k
Kuivinen
[PATCH] Use
a
tem
p
orary
i
ndex file when we merge
the
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredr
i
k Kuivinen
[PATCH]
Adjust g
i
t
-m
e
rge-r
e
curs
i
ve
.
py for the new tool
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fr
e
dri
k
K
u
i
v
i
nen
[PATCH] Don't output 'A
u
tomat
i
c
me
r
g
e
failed,
.
.
.
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
r
ed
r
ik
Kuiv
i
ne
n
[PATCH] Be more
l
i
ke th
e
'resolve' strategy
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kui
v
in
e
n
[PATCH] Rename the 'fredrik'
merge strategy to
'
r
e
cur
s
ive'
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik
K
uivinen
[
P
A
TCH] Ma
k
e
the ProgramError c
l
ass p
r
intable
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fr
e
drik
Kuivinen
[
PA
T
CH]
M
ake s
u
re we die if we
d
on't ge
t
enou
g
h argument
s
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fred
r
ik K
u
ivinen
[PATC
H
] Intro
d
uce a 'die' functio
n
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fr
e
dri
k
Kui
v
i
n
en
[PATCH
]
Exit with statu
s
cod
e
2 if w
e
get an e
x
cepti
o
n
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fre
d
r
i
k
K
u
ivine
n
[P
A
TCH] Fix ass
e
r
tion failure
w
hen merging com
m
o
n ancestors
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-04
Fredr
i
k Kuivinen
[
P
ATCH
]
M
ake git-apply under
s
t
a
nd
i
ncomplete li
n
e
s
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree