repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'dm/make-threaded-simplify'
2010-01-26
Fredrik Kuivinen
T
h
readed
g
rep
Signed-off-by:
Fredrik Kuivinen
<frekui@gmail.com>
commit
|
commitdiff
|
tree
2007-02-23
Fredrik Kuivinen
F
i
x 'git c
o
mmit -a
'
in
a
newl
y
initialized r
e
posit
o
ry
Signed-off-by:
Fredrik Kuivinen
<frekui@gmail.com>
commit
|
commitdiff
|
tree
2007-02-18
Fred
r
ik
Kuivinen
Documentation/i18n
.
tx
t
: it is i18n
.
commitencoding n
o
t
.
.
.
Signed-off-by:
Fredrik Kuivinen
<frekui@gmail.com>
commit
|
commitdiff
|
tree
2007-02-18
F
redr
i
k Kuivinen
Read the c
o
nfig in rev-list
Signed-off-by:
Fredrik Kuivinen
<frekui@gmail.com>
commit
|
commitdiff
|
tree
2007-02-18
F
r
edrik
K
u
ivi
n
en
New
a
utoconf test for iconv
Signed-off-by:
Fredrik Kuivinen
<frekui@gmail.com>
commit
|
commitdiff
|
tree
2007-01-06
Fred
r
ik Kuivinen
inst
a
web: N
i
cer error mess
a
ge when the http d
a
emon
.
.
.
Signed-off-by:
Fredrik Kuivinen
<frekui@gmail.com>
commit
|
commitdiff
|
tree
2006-06-17
Fredrik K
u
i
v
inen
blame:
Add --time to
pr
o
duce raw
t
im
e
stam
p
s
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-05-16
Fredrik
Kuivinen
U
p
dat
e
t
h
e documentatio
n
for
git-merge-base
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-05-04
Fredrik Kuivinen
b
l
ame: Fix path pruning
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-18
Fredrik
K
uivinen
Makefile: Add TAGS and tags targets
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-17
Fre
d
rik K
u
ivinen
b
l
ame: Fix git-b
l
a
m
e
<d
i
rect
o
ry>
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-17
Fredr
i
k Kui
v
in
e
n
blame: Nicer output
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-11
F
r
e
d
r
ik Kuivinen
blame: Rename detection (take
2)
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-11
Fre
d
rik Kuivinen
rev-l
i
b: Make it
e
a
s
y
to do rename tracki
n
g (
t
ake 2)
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-11
Fredrik
K
uivinen
Make it possible
t
o not
clobber object
.
util in sort_in_topol
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-09
Fredrik Kuivinen
Nicer o
u
t
put from '
g
it'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-09
F
redrik
Kui
v
inen
Re
m
o
ve
t
raili
n
g dot a
f
te
r
sh
o
rt d
e
scription
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-09
Fredrik Kuivinen
Fix so
m
e inc
o
n
s
i
ste
n
cies in the docs
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-06
F
r
edrik Kuivinen
git-blame: Use the sa
m
e tests for git-blame as f
o
r
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-05
Fr
e
drik Kuivine
n
git-
b
lame: Make the
o
utput human readable
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-02
Fredrik
K
uivinen
gi
t
-bla
m
e, t
a
k
e 2
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-21
Fredrik
K
uiv
i
ne
n
Add git-
b
lame, a to
o
l for assigning bl
a
me
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-14
Fred
r
ik Kuiv
i
nen
s/S
H
E
L
L
/
SHEL
L
_PATH
/
in Makef
i
le
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-02
Fredrik Kuivi
n
en
merge
-
recursive: S
p
eed up commit graph construction
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-02
Fredrik
K
ui
v
i
nen
me
r
ge-recursive: Mak
e
us
e
of provided bases
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
Fredr
i
k K
u
ivine
n
git-branch: Docum
e
nta
t
ion fixes
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
Fre
d
r
i
k K
u
iv
i
nen
m
er
g
e-r
e
cursive: Improve the error mes
s
age printed
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fredri
k
Kuivinen
git-whatchanged: A
d
d u
s
ag
e
string
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
F
red
r
ik
K
u
ivinen
git-log: Add
usage string
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fred
r
ik Kuivinen
git-diff: Us
a
ge string clean-up
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-14
Fre
d
rik Kuivine
n
U
s
age me
s
sage clean-up, t
a
ke
#2
commit
|
commitdiff
|
tree
2005-12-03
Fredrik
K
uivinen
N
e
w tes
t
case: C
r
is
s
-cros
s
m
e
r
g
e
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredri
k
Kuivinen
N
e
w test ca
s
e: me
r
ge with directo
r
y
/fil
e
conflic
t
s
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Kuivinen
test-
l
ib
.
s
h:
Add new function, tes
t
_expect_code
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Kuiv
i
nen
git
-
m
e
r
ge:
Exit with code 2 if no
s
trategy was able
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-20
Fr
e
dri
k
Kuivinen
merge
-
r
e
curs
i
ve: Repla
c
e 'ex
c
ept:'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik Kui
v
inen
m
e
r
g
e-recursiv
e
:
Use '~' instead of '_' to sep
a
rate
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fred
r
i
k
Kuivinen
merge-recurs
i
ve: Add
c
op
y
right n
o
tice
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik Kuivinen
merge-recursive
:
Indent
t
h
e
output properly
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fredrik Kuivinen
merge
-
r
e
c
u
rsive: Fix support fo
r
b
r
an
c
h na
m
es containing
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fredrik
Kuivinen
merge-recursive: Fi
x
limite
d
o
u
tput of
r
ename messages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-08
Fr
e
drik
K
uivinen
merge-re
c
ur
s
ive
:
O
nly pr
i
n
t releva
n
t
rena
m
e me
s
sages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-03
Fredrik Kuivin
e
n
[PATCH
]
Enable an
d
fix support f
o
r base le
s
s merges
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik
K
ui
v
inen
[PATCH]
Te
a
ch git-ls-files about '--' to denote end
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik Kuivinen
[
PATCH
]
Teach
the recursive
m
er
g
e str
a
tegy about renames
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik Kuivinen
[PATC
H
] Mor
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
Fre
d
rik Kui
v
inen
[PATCH] recu
r
s
i
ve-merge: Don't
print a stack trac
e
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredr
i
k K
u
ivinen
[PATCH] Use the 'di
e
' function where i
t
is appro
p
riate
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Ku
i
vinen
[PATCH] Use a
tem
p
orary inde
x
file when we merge
t
he
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kui
v
inen
[
PA
T
CH
]
Adj
u
st git-merge-recursive
.
py for
the
new
t
oo
l
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
redrik Kuivinen
[PAT
C
H] Don't
o
ut
p
ut 'Automatic m
e
r
g
e fa
i
led,
.
.
.
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kui
v
inen
[PA
T
CH] Be mo
r
e
l
i
k
e the 'resolve' strategy
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[PATCH
]
Rename
t
he 'f
r
edrik' merge st
r
at
e
gy to
'
r
e
cursive'
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fre
d
r
ik Kuivinen
[PATCH] Make th
e
P
r
o
g
ramError
class prin
t
able
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fre
d
rik Kuivinen
[PATC
H
]
Make su
r
e
w
e
die i
f
we do
n
't
g
et enough argume
n
ts
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
F
r
ed
r
i
k Kuivin
e
n
[
P
ATC
H
] Int
r
oduce a 'die'
f
unction
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredri
k
Kuivinen
[PATCH] Exit with s
t
atus code 2 if we get an e
x
ception
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[
P
ATCH
]
Fix ass
e
rtion fa
i
lur
e
wh
e
n mer
g
ing common ances
t
ors
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-04
Fre
d
rik Kuivinen
[PATCH] Make
g
i
t
-apply
under
s
tand incomplet
e
line
s
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree