repo.or.cz
/
git
/
fastimport.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
simple euristic for further free packing improvements
2006-05-04
Fred
r
ik Kuivinen
bla
m
e: Fix path pr
u
n
i
ng
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-18
Fre
d
rik
K
uivinen
Makefile: Ad
d
TAGS a
n
d tags ta
r
gets
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-17
Fredr
i
k Kuivinen
blame: Fix gi
t
-blame <di
r
ectory>
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-17
F
redrik Kuivinen
blame:
N
i
cer output
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-11
F
r
edrik Kuivinen
blame
:
Rename de
t
ection (take 2)
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-11
Fredri
k
Kuivin
e
n
rev-lib: Mak
e
it easy to
d
o
renam
e
tra
c
king (take 2)
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-11
Fred
r
ik Kuivin
e
n
Make it pos
s
ib
l
e
t
o
not clobber obje
c
t
.
ut
i
l in sort_in
_
top
o
l
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-09
Fredr
i
k Kuiv
i
ne
n
N
i
cer output
from 'git'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-09
Fred
r
ik
Kuivinen
Remove trailing dot aft
e
r short description
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-09
F
re
d
r
i
k
Kuivi
n
en
Fi
x
some i
n
co
n
s
i
stencies in t
h
e docs
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-06
F
r
edrik
K
uivinen
git-blam
e
: Use
t
he sam
e
tes
t
s for git-blame as for
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-05
Fredr
i
k Kuivinen
gi
t
-b
l
ame: Make th
e
o
utput huma
n
r
e
a
dabl
e
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-02
Fredrik Kuivinen
g
i
t
-
b
l
am
e
, take 2
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-21
F
redrik Kuivinen
Add git-
b
lam
e
,
a to
o
l for assig
n
ing blame
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-14
Fredrik Ku
i
vinen
s/SHELL/SHELL_PATH/ in M
a
kefile
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-02
Fredrik Kui
v
inen
merge-recu
r
s
i
ve: Speed
u
p commit graph co
n
s
tru
c
tion
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-02
Fredrik Kuivine
n
merge
-
rec
u
rsive:
M
ake use
o
f pr
o
vided bases
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
Fre
d
r
ik Kuivinen
g
i
t-branch: Docume
n
tation fi
x
es
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
Fred
r
ik Kuivinen
merge-recursive: Imp
r
ove the error
m
essage pri
n
t
e
d
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fre
d
rik Kuivinen
git-
w
hatch
a
nged: Add us
a
ge stri
n
g
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fr
e
drik Kuivinen
git-log:
Add
u
sage string
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fred
r
ik Kuivinen
gi
t
-d
i
ff:
U
sage str
i
ng clean-up
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-14
Fred
r
ik Kuivinen
Usage mes
s
a
g
e
cl
e
an-up, take
#
2
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Kuivinen
New test case: Criss-cr
o
ss merge
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
F
r
edri
k
Kuivi
n
en
New test case: merg
e
with
directory/f
i
le conflicts
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fre
d
rik
Kuivinen
t
es
t
-l
i
b
.
sh: Add new function, test_expec
t
_code
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fr
e
d
r
ik K
u
i
v
inen
git-merge: Ex
i
t w
i
th code 2 if no
st
r
ategy was able
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-20
Fredrik
Kuivinen
m
erge-
r
ecursive: Repl
a
ce 'except:'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik
Kuivinen
mer
g
e
-
r
e
c
ursi
v
e: Use
'
~' instead o
f
'_' to separate
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fre
d
rik Kuiv
i
nen
merge-r
e
cu
r
sive: Add
cop
y
righ
t
notice
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik
Kuivi
n
en
m
erg
e
-recursive: Indent the output p
r
operly
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fredrik
K
u
i
v
inen
merg
e
-recursive: Fix
s
upport fo
r
b
ranch names containing
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
F
r
ed
r
i
k K
u
ivinen
merge-recursive: Fi
x
limited output of rena
m
e
m
essages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-08
F
r
edrik Kuivinen
merge-
r
ecu
r
si
v
e:
Only pr
i
nt rele
v
ant
rename messages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-03
Fred
r
ik K
u
ivinen
[PATCH] En
a
bl
e
an
d
fix support for base less merges
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik Kuivi
n
en
[P
A
TCH] Teach git-l
s
-files about '
-
-' t
o
denote
e
nd
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
F
r
edri
k
Kui
v
inen
[P
A
TCH]
T
e
a
ch the re
c
ursive merge stra
t
egy ab
o
ut ren
a
mes
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik Ku
i
vinen
[PATCH] More descr
i
ptive m
e
ssage
s
f
o
r conflict c
a
ses
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
F
r
edrik Ku
i
v
i
n
e
n
[PATCH] recursiv
e
-
m
erg
e
: Don't print a stac
k
trac
e
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredri
k
K
uivinen
[PATCH] Use the 'die'
function
w
here
i
t is app
r
opri
a
te
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
r
edrik
Ku
i
vinen
[PATCH]
Use
a
temporar
y
index fi
l
e when we merge the
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[PATCH] Adjust
git
-
merge-rec
u
rsive
.
p
y fo
r
t
h
e new tool
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kui
v
inen
[PATCH] Don't output 'Automatic merge fa
i
le
d
,
.
.
.
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
r
edrik Ku
i
vinen
[PATCH
]
Be more like t
h
e 'resolve' strategy
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fr
e
drik Kuivinen
[PATCH] Renam
e
the 'fr
e
drik' merge
s
trateg
y
to 'recursiv
e
'
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik
K
u
ivinen
[PATC
H
] Make the ProgramError c
l
a
s
s
p
ri
n
ta
b
le
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredr
i
k Kuivinen
[PATCH] Mak
e
sure we
die
i
f
we don't get en
o
ugh arguments
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fred
r
ik Kuivinen
[
P
ATCH] Introduce 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 status cod
e
2
if we get
a
n excepti
o
n
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
F
r
e
d
rik Kuivin
e
n
[PATCH] F
i
x assert
i
on fail
u
re
w
h
e
n merging
common a
n
cestor
s
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-04
F
redrik Kuivinen
[PAT
C
H
] Make git-apply
u
nde
r
stand incomp
l
ete lin
e
s
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree