repo.or.cz
/
git
/
debian.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
remove the artificial restriction tagsize < 8kb
2006-05-16
Fredrik Kui
v
in
e
n
U
pdate the documentatio
n
for git
-
merge-base
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-05-04
F
re
d
rik Kuivinen
bla
m
e:
Fix path pruning
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-18
Fred
r
ik
Kuivinen
M
akefile: Add TAGS
a
n
d
tags
target
s
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-17
F
redri
k
Kuivinen
blame: Fix git-bl
a
m
e
<directory>
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-17
Fredri
k
Kuivinen
blame: Nice
r
ou
t
put
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-11
Fredrik
K
uivinen
blame: Rename d
e
tection (tak
e
2)
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-11
F
r
ed
r
ik Ku
i
vinen
rev-
l
ib: Make it easy to do re
n
ame tracking
(take 2)
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-11
Fredri
k
Kuivinen
Make it possibl
e
to not clobber object
.
uti
l
in sort_in_topol
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-09
F
redrik Kuivinen
Nicer outpu
t
f
r
om 'git
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-09
Fredr
i
k Kuivinen
Remove trailing dot
a
f
t
er s
h
or
t
d
es
c
r
i
p
tion
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-09
Fredrik
K
uivinen
Fix
some inconsistenc
i
es in t
h
e d
o
cs
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-06
Fredrik Kuivinen
git
-
blam
e
: Us
e
the s
a
me te
s
ts f
o
r git-blame as for
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-05
Fredrik Kuivinen
git-blame: M
a
ke the outpu
t
human
readable
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-02
Fredri
k
Kuivinen
gi
t
-
b
lame, take 2
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-21
Fredrik K
u
ivi
n
en
Add
g
it-blame
,
a tool for a
s
signing blame
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-14
Fr
e
drik Kuivinen
s/SHELL
/
SHELL_PATH/ i
n
Makefile
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-02
Fre
d
rik Kuivinen
merge-recurs
i
ve: Speed up
commit gra
p
h construction
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-02
Fredrik
K
uivinen
merg
e
-
r
ecursive: Make use o
f
provi
d
ed bases
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
Fredrik Kuiv
i
nen
git-b
r
anch: Documentation fixes
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
F
redrik Ku
i
vinen
merge-recursive:
I
m
p
r
ove t
h
e
erro
r
messag
e
printed
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
F
r
edrik Ku
i
vin
e
n
git-w
h
a
t
ch
a
ng
e
d: Ad
d
u
sage
s
tr
i
ng
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fredr
i
k
Kuivin
e
n
git-l
o
g
:
A
dd usage string
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fredrik Kuiv
i
n
e
n
git-diff: Usag
e
string
c
lean-u
p
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-14
Fred
r
ik Kuivine
n
Usage message clean-up, take #2
commit
|
commitdiff
|
tree
2005-12-03
F
r
edrik
K
u
i
vinen
New
t
est ca
s
e: Cri
s
s-cross merge
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Kuivinen
New test c
a
se: merge with
d
irectory/fi
l
e conflicts
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Kui
v
i
n
en
test-lib
.
sh: Add new
f
u
n
c
tion, test_expect_code
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
F
r
edrik Kuivin
e
n
git-merge:
E
x
it with
code 2 if
no strategy was able
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-20
F
redrik Kuivinen
merge-recursive:
R
e
p
lace
'
except:
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
F
r
edrik K
u
ivinen
merge-recursive: U
s
e
'~
'
inst
e
ad of '_' to separa
t
e
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik Ku
i
vinen
me
r
ge-recursive: Add
copyright not
i
ce
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik Kuiv
i
nen
merge-recursive: Indent
t
he out
p
ut
proper
l
y
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fre
d
r
i
k Kuivinen
merge-recursi
v
e: Fix
s
u
pp
o
rt for
b
ran
c
h names c
o
ntaining
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fredr
i
k Kuivinen
m
erge-recursive: Fix li
m
ited output of ren
a
me mes
s
age
s
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-08
F
r
edrik Kuivinen
mer
g
e-recursive:
O
n
l
y print relevant rename
messages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-03
Fredrik Kuivine
n
[P
A
TCH] Enable
a
nd fix suppor
t
fo
r
ba
s
e less merg
e
s
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fr
e
dri
k
K
uivinen
[
PATCH] Teach
g
i
t-ls-files about '--' t
o
denot
e
end
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredri
k
Kuivin
e
n
[
P
ATCH] Teach the recurs
i
ve merg
e
s
trategy
a
b
o
u
t renames
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik Kuivinen
[PAT
C
H
]
More de
s
criptive messages for conflict cases
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredr
i
k Kuivinen
[P
A
TCH] recursive-merge:
D
on't print a stack trace
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik K
u
ivinen
[PATCH] Use the '
d
i
e
' function wher
e
it is
a
p
p
ropriate
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[
P
A
TCH
]
Use a tempora
r
y i
n
dex file wh
e
n
w
e
m
erg
e
the
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
r
edr
i
k Kuivinen
[PATCH] Adjust g
i
t
-
merge-rec
u
r
s
iv
e
.
py for the new t
o
ol
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fred
r
ik Ku
i
vinen
[PA
T
CH] Don't output 'Automat
i
c merge failed,
.
.
.
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[PATCH] Be mor
e
like the 'resolve' strategy
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
r
edri
k
Kuivinen
[P
A
TCH] Rename the 'fredri
k
' merge strategy to 'recur
s
i
v
e'
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[PATCH] Make the Program
E
r
r
or class p
r
intable
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[
P
A
TCH
]
Make sure we
d
ie if we don't get enough argume
n
ts
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fred
r
ik
K
uivinen
[PAT
C
H
] Introduc
e
a '
d
ie' functio
n
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
F
red
r
ik Kuiv
i
nen
[P
A
TCH
]
Exit with s
t
atu
s
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] F
i
x
asserti
o
n
f
ailure w
h
en me
r
ging common ancestors
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-04
Fredr
i
k
Kuivinen
[PATCH]
M
ake
git
-
appl
y
underst
a
nd incomp
l
e
t
e lin
e
s
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree