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
cvsimport: introduce _fetchfile() method and used a 1M buffer to read()
2006-05-16
F
r
edrik K
u
ivinen
Update the doc
u
m
e
ntation for git-merge-ba
s
e
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-05-04
Fredrik Kuivinen
bl
a
me:
F
i
x path pruning
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-18
Fredrik Ku
i
v
i
n
e
n
Makefile: Ad
d
TAGS and tags targets
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-17
F
r
edr
i
k Kuivinen
blame: Fix git-blame <directo
r
y>
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-17
Fred
r
ik Kuivinen
blame: Nicer o
u
t
p
ut
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-11
Fredrik Kuivinen
bla
m
e: Rename detectio
n
(take 2)
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-11
Fred
r
i
k K
u
ivinen
rev-lib
:
Make it eas
y
to do rename tracking (take 2)
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-11
F
r
edrik
Kuivinen
Make it possi
b
l
e to not
c
lo
b
ber
o
bject
.
util in sort_in_topol
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-09
F
redrik Kui
v
inen
Nicer
output f
r
om 'git
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-09
Fredrik Kuivinen
Remove
trailing dot after s
h
or
t
des
c
ription
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-09
Fredrik Kuivinen
Fix s
o
me
inconsi
s
te
n
cies in
t
he do
c
s
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-06
Fredrik Kuivinen
git-blame: Use the same te
s
t
s
for
g
it-blame as
for
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-05
Fredri
k
Ku
i
vinen
git-blame
:
Ma
k
e t
h
e
output human readable
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-02
Fredr
i
k Kui
v
inen
git-blame, t
a
ke 2
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-21
Fredrik Kuivinen
A
dd g
i
t-blame, a to
o
l for assigning blame
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-14
F
r
edrik
Kuivinen
s/SHELL/SHELL_PATH/ in Makefile
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-02
Fredrik
Kuivinen
merge-recursive: Sp
e
e
d
up c
o
m
m
it
graph
c
onst
r
uction
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-02
Fredrik Kuivinen
merge-re
c
u
r
s
i
v
e: Make use of provided bases
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
Fredr
i
k
Kuivine
n
git-branc
h
: Documentation fixes
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
Fredrik K
u
ivinen
merge-recursi
v
e:
I
mprove the
e
r
ror message print
e
d
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fredrik
Kuivi
n
en
g
i
t
-whatchanged: Add usage
strin
g
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
F
r
edrik Ku
i
vinen
git-
l
og:
A
dd usage
str
i
ng
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
F
redrik Kuivi
n
en
git-d
i
ff: Usa
g
e string cle
a
n-u
p
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-14
F
redrik
K
uivin
e
n
Usage
mes
s
a
ge c
l
e
a
n-up, take #2
commit
|
commitdiff
|
tree
2005-12-03
Fredr
i
k Kui
v
inen
New test case: Criss-cross merge
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Ku
i
vinen
N
ew t
e
st case: mer
g
e with directory/file conflicts
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Kui
v
inen
test-lib
.
sh: Add
new
fu
n
ction, tes
t
_e
x
pect_code
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredr
i
k Kuivinen
gi
t
-
merge:
E
x
it wi
t
h
c
ode 2 if no strategy wa
s
abl
e
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-20
Fr
e
drik Kuivine
n
merge-recursive: Replace 'except:'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fre
d
rik Kui
v
inen
merge
-
recursive:
Use '~' instead of '_' to
s
e
p
a
rate
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fre
d
rik Kuivinen
merge-r
e
cursive: Add copyright
not
i
ce
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredri
k
Kuivinen
merge-
r
ecursiv
e
:
Indent the output properly
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fr
e
drik K
u
ivinen
me
r
ge-recursive: Fi
x
support
for bra
n
ch n
a
mes contain
i
ng
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fredrik
K
ui
v
inen
merge-recursive: Fix limited
o
u
tput o
f
ren
a
me messa
g
es
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-08
Fredrik Kuivinen
merge-rec
u
rsive: Only print relevant rename messages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-03
F
r
edrik Kuivinen
[PATCH]
E
na
b
le a
n
d fi
x
supp
o
r
t for base less merges
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik Kui
v
inen
[
P
ATCH
]
Teach git-ls-fi
l
es about '--
'
to denote end
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik Kuivinen
[PATCH] Te
a
ch
the recursive
m
erge st
r
ategy
a
bout renames
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik Kuivinen
[
P
ATCH] More descriptive me
s
sa
g
es for conflict cases
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik Ku
i
vinen
[
PATCH] recur
s
ive-merg
e
:
D
on'
t
pr
i
nt
a st
a
ck
trace
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fred
r
i
k
Kuiv
i
nen
[PATCH]
U
se the 'die' function wher
e
it is a
p
propriate
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Ku
i
vine
n
[PATCH] U
s
e a tempora
r
y index file w
h
en
we merge t
h
e
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fr
e
d
rik Kuivinen
[PATCH]
Adjust git
-
mer
g
e
-
r
ecursi
v
e
.
p
y fo
r
the new tool
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[PA
T
CH] Don'
t
output 'Automatic mer
g
e fai
l
e
d
,
.
.
.
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fr
e
drik K
u
ivinen
[PATC
H
] Be more lik
e
the '
r
esolve' strategy
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[PATCH] Renam
e
t
h
e 'fredrik
'
merge strat
e
gy t
o
'r
e
cursive'
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik K
u
i
vinen
[PATCH] Make the Prog
r
amError class printable
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[PATCH]
M
ake sure we d
i
e
i
f
w
e
don't
g
et enough
arguments
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
F
r
edrik Kuivinen
[PATCH] In
t
roduce a 'die
'
function
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivine
n
[PATCH]
E
xit with
s
t
a
t
u
s code 2
i
f we get an exce
p
ti
o
n
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[PATCH
]
F
i
x assert
i
o
n fail
u
r
e
when m
e
r
ging co
m
mo
n
a
n
cestors
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-04
Fred
r
i
k
K
uiv
i
nen
[PATCH] Make
g
it-apply
u
nder
s
tand
i
ncomplete lines
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree