repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
GIT 1.3.0 rc1
2006-03-18
F
r
edrik Kuivin
e
n
Makefile: A
d
d TAGS and tag
s
targets
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-17
F
redrik Ku
i
v
inen
blame: Fix git-blam
e
<directory>
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-17
Fredrik Kuivinen
blame: Ni
c
er output
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-11
Fredrik Ku
i
vine
n
bl
a
me: Rename detect
i
o
n
(
take 2)
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-11
Fr
e
drik
Kuivinen
rev-lib: Make i
t
easy
t
o
d
o rename tracking (take 2)
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-11
Fr
e
drik
Ku
i
v
i
nen
Ma
k
e
i
t possib
l
e
to
no
t
clobber ob
j
ect
.
u
t
i
l in sort_
i
n_topol
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-09
Fre
d
ri
k
Kuivinen
Nicer outp
u
t fr
o
m 'g
i
t'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-09
Fredri
k
Kuivinen
Remo
v
e trailing dot after short description
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-09
F
r
ed
r
i
k
Kuivin
e
n
Fix s
o
m
e
inc
o
n
sistenc
i
e
s in the docs
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-06
Fredrik Kuivinen
gi
t
-b
l
ame
:
U
s
e the sa
m
e
test
s
for
git-b
l
ame as
fo
r
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-05
F
r
ed
r
ik Kui
v
inen
git-
b
lame: Ma
k
e the out
p
ut human readable
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-02
Fredrik
Kuivinen
g
i
t
-blame, t
a
ke 2
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-21
F
re
d
rik Kuiv
i
nen
Add git-
b
lame,
a
tool for assigning bla
m
e
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-14
F
r
edri
k
Kuivinen
s/SHELL/SHELL_PATH/ in
M
akefile
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-02
Fredrik Kuivin
e
n
merge
-
recursi
v
e:
S
pee
d
u
p
c
o
mmit graph construction
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-02
F
redri
k
Kuivinen
merge-recurs
i
v
e: Mak
e
us
e
of pr
o
vided bases
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
Fredrik
K
uivinen
git-
b
r
anc
h
: Documentation fixes
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
F
redr
i
k Ku
i
v
i
nen
mer
g
e-recursive: Impr
o
ve the
error mess
a
ge pr
i
nted
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
F
redrik Kuivinen
git-whatcha
n
g
e
d
: Add usage string
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
F
r
edri
k
Kuivine
n
git-log:
Add
u
sag
e
st
r
ing
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fredri
k
Kuiv
i
n
e
n
git-diff: Us
a
ge stri
n
g clean-up
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-14
Fre
d
rik
Kuivinen
Usage message clean-up,
t
a
ke #2
commit
|
commitdiff
|
tree
2005-12-03
F
r
edrik Kuivinen
N
ew test
case: Criss-cross merge
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
F
r
edrik Ku
i
v
i
n
en
N
e
w test case
:
merge w
i
th
directory/fi
l
e
c
o
nfli
c
ts
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik
Kuiv
i
nen
test-lib
.
sh: Add new
functi
o
n, tes
t
_
e
xpect_
c
od
e
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Kuivin
e
n
git-me
r
g
e
: Ex
i
t wit
h
code
2
if no strate
g
y was able
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-20
Fredr
i
k
K
uivi
n
e
n
merge-recursive: Replace 'exc
e
pt:'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik K
u
ivinen
mer
g
e-recursive
:
Use '~
'
i
nstead of '_' to se
p
ar
a
te
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fr
e
drik
K
u
i
vin
e
n
merge-recursive: Add co
p
yright n
o
tice
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik Kuivinen
merg
e
-recursive: In
d
ent the output properly
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fre
d
rik
Kuivinen
m
e
r
ge-
r
ecursive:
Fi
x
su
p
po
r
t f
o
r
b
r
a
nch name
s
containing
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
F
r
e
drik
Kuivinen
merge-recurs
i
v
e
:
Fix lim
i
ted output
of r
e
name
m
essag
e
s
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-08
F
redrik K
u
iv
i
n
en
m
erge-re
c
ursive: Only print re
l
evant rename messages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-03
Fredr
i
k
Ku
i
vi
n
en
[PATCH] Enab
l
e
a
nd fix support for
b
ase le
s
s
m
erg
e
s
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik
Kuivi
n
en
[PATCH] T
e
ac
h
git-
l
s-files about
'
--' to d
e
n
o
te
e
nd
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
F
r
edrik Kuivi
n
en
[PAT
C
H] Teach the
recu
r
sive merge strategy ab
o
ut renames
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik Kui
v
inen
[P
A
TCH] More descriptive messa
g
es for c
o
n
f
lict ca
s
e
s
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
F
r
edrik Kuivi
n
en
[PATCH]
recursiv
e
-merge: Don't print
a
s
t
a
ck trace
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[PA
T
C
H
]
Us
e
the 'die'
function where it is appropriate
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kui
v
inen
[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
Fre
d
rik Ku
i
vi
n
en
[
PATCH]
A
dj
u
st git-merge-
r
e
c
u
rsive
.
py for the
n
ew t
o
o
l
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
r
e
drik Kui
v
inen
[
P
ATCH
]
Do
n
't o
u
t
p
ut
'
Automatic merge fail
e
d,
.
.
.
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fre
d
rik Kuivinen
[PATCH
]
Be more
l
i
ke the 'resolve' strate
g
y
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik K
u
ivi
n
e
n
[
P
ATCH] Rename th
e
'
fredrik' merge strategy to 'r
e
cursive'
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredr
i
k K
u
ivinen
[PATCH] Make
t
he ProgramEr
r
or c
l
ass printab
l
e
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fred
r
ik Kuivinen
[PATC
H
]
Make sure we die if we don't ge
t
en
o
u
g
h arguments
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivi
n
e
n
[PATCH] Introduc
e
a 'die' function
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fr
e
drik Kui
v
inen
[
P
ATCH
]
Exit with
status c
o
de 2 if we get a
n
exce
p
tion
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik
Kuivinen
[PATC
H
] Fix assertion
f
ail
u
re when
merging common ancestor
s
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-04
Fredrik Kuivinen
[PATCH] Mak
e
git-apply u
n
derstand inc
o
mplete li
n
e
s
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree