repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'cb/maint-ls-files-error-report' into maint
2011-06-22
Fredr
i
k Kui
v
inen
Makefile: Tr
a
ck changes to L
D
F
LAGS and
r
e
link
w
h
e
n
.
.
.
Signed-off-by:
Fredrik Kuivinen
<frekui@gmail.com>
commit
|
commitdiff
|
tree
2010-01-26
Fredrik Kuivinen
Threaded
grep
Signed-off-by:
Fredrik Kuivinen
<frekui@gmail.com>
commit
|
commitdiff
|
tree
2007-02-23
Fr
e
d
r
ik Kuiv
i
nen
Fix 'git commit -a'
i
n
a newly init
i
alized
repository
Signed-off-by:
Fredrik Kuivinen
<frekui@gmail.com>
commit
|
commitdiff
|
tree
2007-02-18
F
redrik
K
u
i
vi
n
en
Docu
m
entation/i18n
.
tx
t
: it is i18n
.
commitenc
o
ding not
.
.
.
Signed-off-by:
Fredrik Kuivinen
<frekui@gmail.com>
commit
|
commitdiff
|
tree
2007-02-18
Fredrik Kuivi
n
en
Re
a
d t
h
e config in rev-l
i
st
Signed-off-by:
Fredrik Kuivinen
<frekui@gmail.com>
commit
|
commitdiff
|
tree
2007-02-18
F
redrik Kuivinen
New autoco
n
f test
f
or iconv
Signed-off-by:
Fredrik Kuivinen
<frekui@gmail.com>
commit
|
commitdiff
|
tree
2007-01-06
Fr
e
drik
Ku
i
v
inen
ins
t
aweb: N
i
cer error m
e
ssage w
h
en the http daemon
.
.
.
Signed-off-by:
Fredrik Kuivinen
<frekui@gmail.com>
commit
|
commitdiff
|
tree
2006-06-17
Fr
e
drik Kuivinen
blame: Add --ti
m
e to p
r
odu
c
e
raw timesta
m
ps
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-05-16
Fredrik Kuivinen
U
p
date
the documenta
t
ion for git-merge-base
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-05-04
Fredrik K
u
ivinen
blame: Fix path
p
runing
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-18
Fredrik Kuivinen
M
akefile:
Add TAGS an
d
t
ags targe
t
s
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-17
Fredrik
K
u
i
v
inen
blame: Fix
g
i
t-blame <directo
r
y>
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-17
Fr
e
d
r
ik
K
uivi
n
en
b
l
a
me:
N
ice
r
output
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-11
F
r
edr
i
k Kuivinen
bla
m
e
:
R
e
n
am
e
dete
c
ti
o
n (take
2)
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-11
Fredrik K
u
ivinen
re
v
-lib: Make it easy to d
o
rename tracking (take 2)
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-11
Fredri
k
Ku
i
v
i
nen
Ma
k
e it possible to no
t
clobber objec
t
.
u
til in sort_in_topol
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-09
Fredrik
K
ui
v
inen
N
i
c
er o
u
tp
u
t from 'git'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-09
F
r
edrik Kuivinen
Rem
o
ve trai
l
i
ng dot after short description
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-09
F
r
e
drik Kui
v
inen
Fix some inconsistencies in the docs
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-06
Fred
r
ik Kuivinen
git-b
l
a
me: Use the same test
s
for git-blame a
s
for
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-05
Fredrik Kuivinen
git-bla
m
e
: Make the output human reada
b
le
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-02
Fredrik Kuivinen
gi
t
-bla
m
e
,
take 2
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-21
Fredr
i
k Ku
i
v
i
nen
Add git-bla
m
e
, a
tool for assigning
blame
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-14
Fredrik Kuivinen
s/SHELL/SHELL_PATH/
i
n Makefile
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-02
Fredrik
K
uiv
i
nen
merge
-
recursi
v
e: Speed up commit gr
a
ph const
r
u
c
tion
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-02
F
r
edrik
K
u
i
v
in
e
n
m
erge-recursive: Make use o
f
pr
o
vided bases
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
Fredrik Kuivinen
git-bra
n
c
h:
Doc
u
mentation fixes
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
Fredrik
K
uivinen
m
erg
e
-recursi
v
e:
Improve t
h
e e
r
ror mess
a
ge printe
d
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fredrik Kui
v
i
n
e
n
git-
w
hatchang
e
d: Add usage string
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fredrik
Kuiv
i
nen
g
it-log: Add
usag
e
string
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fredrik K
u
i
v
inen
git-diff: Usage
string
clean-up
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-14
Fredrik Ku
i
v
i
nen
Usage
message
clean-
u
p,
ta
k
e #2
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Ku
i
vinen
New test case: Cris
s
-cross
merge
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fre
d
ri
k
Kuivinen
New test ca
s
e: merge with direct
o
ry/fil
e
conflicts
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
F
r
edrik Kuivinen
test-lib
.
sh:
Add new
function, test
_
expect_code
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik
Kuiv
i
nen
git-me
r
ge: Exit wi
t
h
c
ode 2 if no stra
t
egy was
able
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-20
F
r
edrik Kuivinen
me
r
g
e
-r
e
cursive: Replace 'ex
c
ept:'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fr
e
drik Kuivinen
mer
g
e-recurs
i
ve: U
s
e
'~
'
i
nstead of '_'
t
o separate
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik Kuivinen
merge-recursive: Add copyright noti
c
e
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik Kuivinen
merge-recursive: Indent
t
he output properl
y
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fredrik
K
uivinen
merge-recursive: F
i
x
s
upport
f
or branch nam
e
s con
t
aining
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fredr
i
k
Kuivinen
merge-recursive: Fi
x
limited outp
u
t of rena
m
e
messages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-08
F
r
edrik Kuiv
i
nen
mer
g
e-re
c
ursive: Only print
r
e
l
e
v
a
n
t
r
ename messages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-03
Fredrik Kuivine
n
[PAT
C
H] Ena
b
le and fix support for base less merges
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fre
d
rik Kuivi
n
en
[PATCH] Teach git-
l
s-files abou
t
'--'
to den
o
te end
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik Ku
i
vinen
[
P
ATCH] Teach the re
c
ursive m
e
rge strategy ab
o
u
t
renames
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
F
redrik Kuivinen
[PATCH] More descriptive messages fo
r
conflict cas
e
s
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredr
i
k Kuivinen
[PATCH] rec
u
r
s
i
v
e
-merge: Don't print a stack trac
e
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[
P
A
TCH] Use th
e
'd
i
e
'
fun
c
ti
o
n wh
e
re it is appropriate
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
redrik Kuivinen
[PATCH] Use a tempora
r
y index file when we merge the
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[
P
ATCH] A
d
just git-
m
e
r
ge-recursive
.
py for the
n
ew tool
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[PATCH] Do
n
't output 'Automatic merge failed
,
.
.
.
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik K
u
ivinen
[PATCH] Be
m
ore like the 'resolve'
s
trategy
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[PATCH] Rename the
'fredrik' me
r
ge
s
t
rate
g
y to 'recursiv
e
'
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuiv
i
nen
[PATCH] Mak
e
t
h
e ProgramErro
r
class printable
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kui
v
inen
[PATCH] Ma
k
e
sure we die if we don't get
en
o
ugh
arguments
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredri
k
Ku
i
vinen
[PATCH] Int
r
oduce a 'die' f
u
nction
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kui
v
inen
[
PATCH] Ex
i
t w
i
th status code
2 if
w
e get an exception
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[PATCH] Fix assertion fai
l
u
re whe
n
m
erging
c
o
mm
o
n ance
s
tors
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-04
Fredrik Kui
v
inen
[
PATCH]
M
ake git
-
apply und
e
rsta
n
d incomplete lines
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree