repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'mz/doc-rebase-abort' into maint
2011-06-22
F
redr
i
k Kuivinen
Makefile: Tr
a
ck
c
hanges to LDFLAGS and relink when
.
.
.
Signed-off-by:
Fredrik Kuivinen
<frekui@gmail.com>
commit
|
commitdiff
|
tree
2010-01-26
Fredrik Kuivinen
Threaded
g
rep
Signed-off-by:
Fredrik Kuivinen
<frekui@gmail.com>
commit
|
commitdiff
|
tree
2007-02-23
Fredrik Ku
i
vinen
F
i
x 'git com
m
it -a'
i
n a
newly
in
i
tialize
d
repository
Signed-off-by:
Fredrik Kuivinen
<frekui@gmail.com>
commit
|
commitdiff
|
tree
2007-02-18
Fred
r
ik Kuivin
e
n
D
o
cumentation/i1
8
n
.
txt: i
t
is i18n
.
commitencod
i
ng not
.
.
.
Signed-off-by:
Fredrik Kuivinen
<frekui@gmail.com>
commit
|
commitdiff
|
tree
2007-02-18
Fredrik Kui
v
inen
Re
a
d the con
f
i
g
in rev-list
Signed-off-by:
Fredrik Kuivinen
<frekui@gmail.com>
commit
|
commitdiff
|
tree
2007-02-18
Fredrik Kuivinen
New a
u
toconf test for iconv
Signed-off-by:
Fredrik Kuivinen
<frekui@gmail.com>
commit
|
commitdiff
|
tree
2007-01-06
F
redrik Kuivinen
i
nstaweb
:
Nicer erro
r
mess
a
g
e when the http daemon
.
.
.
Signed-off-by:
Fredrik Kuivinen
<frekui@gmail.com>
commit
|
commitdiff
|
tree
2006-06-17
Fred
r
ik
K
uivinen
blame: Add --time
to produce ra
w
t
ime
s
tamp
s
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-05-16
Fredrik Kuivinen
Upd
a
te
the documentat
i
on for g
i
t
-merge
-
base
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-05-04
Fredrik Kuivinen
bl
a
me: Fix
p
ath
p
runi
n
g
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-18
F
r
e
drik Kuivi
n
en
Makefile: Add T
A
GS and tags ta
r
gets
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-17
Fre
d
r
ik
K
ui
v
inen
bl
a
me: Fix git-blame <di
r
ector
y
>
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-17
Fredrik Kuivinen
b
lame: Nicer ou
t
put
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-11
Fred
r
ik Kuivine
n
blame: Rename detection
(
take 2)
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-11
Fredri
k
Kuivinen
rev-lib: Ma
k
e it easy to do rename tracking (
t
ake 2)
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-11
Fredr
i
k
K
uivinen
Mak
e
it
p
ossible to not
clobb
e
r
obje
c
t
.
util in sort_in_topol
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-09
Fredrik Kuivinen
N
i
cer o
u
tpu
t
from 'git'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-09
Fredrik Kuivinen
Rem
o
ve trailin
g
dot
a
ft
e
r
s
hort desc
r
i
ption
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-09
Fred
r
ik Kuivine
n
Fi
x
some i
n
co
n
sistencies in t
h
e do
c
s
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-06
Fredrik Kuivinen
git-blame
:
Use the sa
m
e tes
t
s
for
g
it-blame as for
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-05
Fred
r
ik Kui
v
ine
n
git-blam
e
: Make the o
u
t
p
u
t human readable
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-02
F
redrik
Kui
v
inen
git-blame, take 2
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-21
Fredrik Ku
i
vine
n
Add
g
it-blame
,
a tool for assigning blame
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-14
Fredrik
K
uivinen
s/SHELL/SHELL_PATH/ in Makefile
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-02
Fredrik Kuivinen
m
e
r
g
e-
r
ec
u
r
s
ive: S
p
eed up
co
m
m
it graph c
o
nst
r
uction
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-02
Fredrik Ku
i
vi
n
en
merge-recursive: Make use
of provided bas
e
s
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
Fredri
k
Kui
v
i
n
en
git
-
branch: D
o
cu
m
entation fi
x
es
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
Fredrik Kuivinen
m
erge-recursive:
I
mpr
o
ve the
error message printed
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fredrik Kuivinen
git-wha
t
changed: Add usage strin
g
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
F
r
edri
k
Kuivinen
git-log: Add usage string
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fr
e
d
rik Kuivi
n
en
git-di
f
f: Usa
g
e
str
i
ng c
l
ean-u
p
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-14
Fredrik
Kuivin
e
n
Usage message
clean
-
up, take #2
commit
|
commitdiff
|
tree
2005-12-03
F
redr
i
k Kuivinen
Ne
w
test case: Criss
-
cross m
e
r
g
e
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Kuiv
i
nen
N
e
w test case:
me
r
ge with directory/file conflicts
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Kuivin
e
n
test-lib
.
sh:
Ad
d
new function, test_e
x
pect_code
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Kuivinen
git-mer
g
e: Exit wit
h
cod
e
2 if no strategy was abl
e
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-20
F
redri
k
Kuivinen
merg
e
-recursive:
R
eplace 'except:'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fred
r
ik Kuivinen
mer
g
e
-re
c
ursive
:
Use '~
'
i
nstead of '_' to
s
eparate
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredr
i
k Kui
v
inen
merge-recursive: Add copyr
i
ght notice
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik Kuivinen
m
erg
e
-recursive: Inden
t
the outpu
t
properly
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fredrik Kui
v
i
n
en
merge
-
recursive: Fix su
p
po
r
t for branch na
m
es co
n
tainin
g
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
F
redrik Kuivinen
merge-re
c
u
rsive:
F
i
x limited outpu
t
of rename
m
e
s
sag
e
s
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-08
Fredrik Kuiv
i
nen
mer
g
e-re
c
ursive: On
l
y print re
l
e
v
a
n
t
rename messages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-03
F
redrik Kuivin
e
n
[PAT
C
H] Enable an
d
fix suppo
r
t for
b
ase less merg
e
s
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
F
r
edr
i
k Kuiv
i
nen
[PATCH] Teach git-ls-fil
e
s about '-
-
' t
o
de
n
o
te end
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fred
r
ik Kuivinen
[PATCH] Teac
h
the recurs
i
v
e
merge strategy about
r
enames
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fred
r
ik Kuivine
n
[P
A
TCH] More descripti
v
e
m
essages for co
n
flict
cases
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
F
r
e
drik Kuivinen
[PATCH] recursive
-
merge: Do
n
't print
a
stack
t
r
ace
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[
P
ATC
H
]
U
s
e the 'die' funct
i
on
w
here
i
t is ap
p
ropriat
e
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik
Kuivinen
[PATCH] Use a temporary index file when w
e
m
e
rg
e
the
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fr
e
drik Kuivinen
[PATCH] A
d
just git-
m
erge-recursive
.
py for the new tool
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
r
e
drik Kuivinen
[PATCH] Don't output '
A
utomatic merg
e
f
aile
d
,
.
.
.
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivin
e
n
[PATCH] Be mor
e
like the 're
s
ol
v
e' st
r
ategy
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fred
r
ik K
u
ivinen
[PATCH] Rename the 'fr
e
d
ri
k
' m
e
rge
s
trategy to 'recursive'
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fred
r
ik Kuivi
n
en
[
P
ATCH] Make the ProgramError class print
a
ble
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik
K
uivinen
[
P
A
TCH]
M
ake sure we
d
ie if we don't
g
et
e
nough
a
rgumen
t
s
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredr
i
k Kuivinen
[PA
T
CH] Introdu
c
e
a
'di
e
'
funct
i
on
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fred
r
ik
Kuivinen
[
P
ATCH] Exit w
i
t
h
statu
s
code 2
i
f
we get an exception
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
F
r
edrik Kuivin
e
n
[PATCH
]
Fix a
s
sertion f
a
i
lure when
m
erging c
o
mmo
n
ancestors
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-04
Fredrik K
u
i
v
inen
[PATCH]
M
ake git-apply understand
i
n
c
o
m
p
lete lin
e
s
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree