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 'maint'
2010-01-26
Fredrik
Ku
i
v
inen
T
hread
e
d grep
Signed-off-by:
Fredrik Kuivinen
<frekui@gmail.com>
commit
|
commitdiff
|
tree
2007-02-23
Fredrik Ku
i
v
i
nen
Fix
'
git
c
ommit -a' in a newly initialized
r
epository
Signed-off-by:
Fredrik Kuivinen
<frekui@gmail.com>
commit
|
commitdiff
|
tree
2007-02-18
Fredrik Kuivi
n
e
n
Docum
e
ntation/i18
n
.
txt:
it is i18n
.
c
ommitencoding not
.
.
.
Signed-off-by:
Fredrik Kuivinen
<frekui@gmail.com>
commit
|
commitdiff
|
tree
2007-02-18
Fr
e
drik Kuivinen
Re
a
d the confi
g
in
r
e
v
-list
Signed-off-by:
Fredrik Kuivinen
<frekui@gmail.com>
commit
|
commitdiff
|
tree
2007-02-18
Fredrik Kuivinen
N
e
w autocon
f
test
f
or i
c
o
n
v
Signed-off-by:
Fredrik Kuivinen
<frekui@gmail.com>
commit
|
commitdiff
|
tree
2007-01-06
Fredrik Kuivinen
instaw
e
b
: N
i
cer error
m
e
s
sage when the http da
e
mon
.
.
.
Signed-off-by:
Fredrik Kuivinen
<frekui@gmail.com>
commit
|
commitdiff
|
tree
2006-06-17
Fredrik K
u
ivinen
blame: Add --time to
prod
u
ce raw timestam
p
s
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-05-16
Fredrik Kuivine
n
Update the docum
e
n
tation for gi
t
-merge-base
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-05-04
Fredrik Ku
i
v
i
n
e
n
blame: Fix path
p
runing
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-18
Fredrik K
u
ivine
n
Makefile: Add TAGS and tags t
a
rge
t
s
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-17
Fredrik
Kuivinen
blame
:
Fix git-b
l
ame <directory>
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-17
F
r
edrik Kuiv
i
nen
blame:
N
icer ou
t
put
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-11
Fredrik Kuiv
i
nen
blame: Ren
a
me detectio
n
(
t
a
ke 2
)
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-11
Fredrik Kuivinen
rev-li
b
: Make it easy to do rena
m
e tracking (take 2)
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-11
Fredrik Kuivinen
Ma
k
e i
t
possi
b
le to not clobber object
.
util
i
n sort_in_topo
l
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-09
Fredrik Kuivi
n
en
Nicer out
p
ut from
'git
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-09
Fr
e
drik Kui
v
i
n
en
Remove tra
i
ling
d
o
t
after short
descri
p
tion
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-09
Fre
d
rik Kuiv
i
nen
Fix som
e
incons
i
stencies in the
docs
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-06
Fredrik Ku
i
vinen
git-b
l
a
me: Use the same te
s
ts
for git-bla
m
e
a
s for
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-05
Fr
e
dri
k
Kuivine
n
git-blame: M
a
k
e th
e
out
p
ut huma
n
r
ead
a
b
l
e
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-02
Fredrik Kuivinen
git-blame, take 2
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-21
Fredrik Kuivinen
Add git-blame, a tool
for assig
n
i
ng b
l
ame
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-14
Fredrik Kuivinen
s
/
S
H
E
LL/
S
H
E
LL_PATH/ in Makefile
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-02
Fredrik Ku
i
vinen
merge-recurs
i
v
e: Speed
u
p
commit g
r
aph construct
i
on
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-02
F
redrik Kui
v
inen
merge-recursive: Make use of provided bases
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
Fredrik Kui
v
inen
g
i
t-branch
:
Documen
t
ation fixes
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
Fredrik Kuivinen
me
r
ge-recursiv
e
: Improve the error
message printed
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
F
r
ed
r
ik Kuivine
n
git-whatc
h
ange
d
: Add
u
s
a
g
e
str
i
n
g
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fredrik Kuivinen
g
it-log: Add u
s
age string
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
F
r
edrik Ku
i
vinen
g
it-diff: Usage strin
g
c
l
ean-u
p
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-14
F
r
e
d
rik
K
uiv
i
nen
Us
a
ge message clean-up
,
ta
k
e #2
commit
|
commitdiff
|
tree
2005-12-03
Fred
r
i
k
Kuiv
i
nen
New test case: Criss-cross merge
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Kuivinen
New te
s
t cas
e
: m
e
rge with directo
r
y/fil
e
conflic
t
s
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fr
e
dri
k
K
uivinen
test-lib
.
sh: A
d
d new function, test_
e
xpect_code
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredr
i
k Kuivine
n
git-merge: Exi
t
with
c
ode 2 i
f
no
s
trat
e
gy was able
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-20
Fredrik Kuivinen
merge
-
recurs
i
ve
:
Repla
c
e 'ex
c
ept:'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fred
r
ik Kuivinen
merge-recursive: Use
'~' instead of '_' to
sep
a
rate
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
F
r
e
d
rik Kuivinen
merge-rec
u
rsive: A
d
d copyright no
t
ice
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fred
r
ik Kuivin
e
n
mer
g
e-rec
u
rsive: In
d
ent the
outp
u
t properly
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fredr
i
k
K
uivinen
merge-recursive: Fix
support fo
r
b
ranch name
s
containing
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fred
r
ik Kuivine
n
merge-recursiv
e
: Fi
x
l
i
mited
o
utput of
rename mes
s
ages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-08
Fred
r
ik Kuivinen
merge-r
e
cur
s
ive:
On
l
y print relevant rename messages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-03
F
r
edrik Kuivinen
[P
A
TCH]
E
nable and
f
ix su
p
port for bas
e
less merg
e
s
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik
K
uivinen
[
PATCH] Tea
c
h git-ls-files abou
t
'--' t
o
d
e
note end
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik Kuivinen
[P
A
TCH] Tea
c
h th
e
recur
s
i
v
e m
e
r
ge strategy
abo
u
t
r
enames
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
F
redrik Ku
i
vinen
[PATCH] More des
c
r
i
p
tive messages for conflict cases
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fred
r
ik
Kuivinen
[PAT
C
H] recursive-merge: Don't print a stack trace
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
r
edrik Kuivinen
[PATCH] Use the 'die
'
function
where
i
t is ap
p
r
o
priate
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredr
i
k Kuivinen
[PA
T
CH]
Use a temporary
i
ndex fil
e
when we merge
t
he
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredr
i
k
Kuivinen
[PATCH] Adjust gi
t
-merge-recursive
.
py for the ne
w
tool
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
r
edrik Kuivinen
[PATCH] Don't output 'Automatic m
e
r
ge failed,
.
.
.
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik K
u
ivin
e
n
[
PATCH] Be more like
t
h
e
'
resolve' s
t
rategy
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fred
r
ik Kuivinen
[
PATCH
]
R
e
name t
h
e 'fredrik' me
r
ge strategy to 'recursive'
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
F
r
edr
i
k Kuivinen
[PATCH]
M
a
ke th
e
Program
E
rror c
l
ass pri
n
table
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Ku
i
vinen
[PATCH] Make
s
ure
w
e die
if
w
e
d
on't get enough ar
g
uments
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fr
e
drik Kuivinen
[PATCH
]
Introduce a 'd
i
e' fu
n
ction
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[PATCH
]
Exit w
i
t
h status
code 2 if we ge
t
an
e
xcept
i
on
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
F
redrik Kuivi
n
e
n
[P
A
TCH]
F
i
x a
s
s
e
rt
i
on failure w
h
e
n merging
common ancestors
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-04
Fredrik
Kui
v
i
nen
[
PAT
C
H] Make git-apply understand incomplet
e
lines
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree