repo.or.cz
/
alt-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Add git-show reference
2006-03-17
Fr
e
drik Kuivi
n
en
bl
a
me: Fix git-bl
a
me
<
d
i
r
e
ctory>
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-17
Fred
r
ik Kuivin
e
n
blame: N
i
cer output
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-11
Fr
e
dri
k
Kuivinen
blame: Rename detection (t
a
ke 2)
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-11
F
r
ed
r
ik K
u
iv
i
nen
re
v
-
l
i
b: Ma
k
e i
t
easy to do r
e
nam
e
tracking (take 2)
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-11
F
r
e
drik Kuivine
n
Make it possib
l
e
to no
t
c
l
o
bber object
.
u
t
il
i
n sort_in
_
to
p
ol
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-09
Fredrik Kuivinen
Ni
c
er o
u
tput
f
rom 'g
i
t'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-09
F
r
edr
i
k Kuivi
n
e
n
Rem
o
v
e
t
r
ailing
dot af
t
er short d
e
sc
r
iption
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-09
Fredrik Ku
i
vinen
Fix some inconsistencies i
n
th
e
docs
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-06
Fr
e
drik Kuivinen
gi
t
-blame: Use the same tests for
git-b
l
ame as for
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-05
F
r
e
d
rik Kuiv
i
nen
git-bla
m
e: M
a
ke the
output huma
n
r
e
adable
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-02
Fredrik Kuivinen
git-blam
e
,
take 2
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-21
Fredr
i
k
Kuivinen
Add
g
it-blame, a tool
f
or
assigni
n
g blame
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-14
F
r
edrik
K
u
i
vinen
s/SHELL/SHELL_PATH/
i
n Makef
i
le
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-02
Fredrik Kuivi
n
en
m
erge-
r
ecurs
i
v
e: Speed up comm
i
t graph constr
u
c
t
ion
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-02
Fredrik Kuivine
n
merge-recursive
:
Ma
k
e use of
p
rovided bases
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
Fredri
k
Kuivi
n
en
git-branch: Docu
m
entation
f
ixes
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
F
redrik Kuivin
e
n
m
erg
e
-recursive
:
I
m
p
r
ov
e
the
e
r
r
or
m
es
s
a
g
e
p
rint
e
d
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fr
e
drik
Kuivinen
git-wh
a
tc
h
a
n
ged
:
Add usage
string
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fr
e
drik Kuiv
i
nen
git-lo
g
: Add
u
s
a
ge s
t
ring
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fredrik Kuivi
n
en
g
it-diff: Usage string clean-up
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-14
F
redri
k
Kuivinen
Usage
message cle
a
n-up
,
ta
k
e
#2
commit
|
commitdiff
|
tree
2005-12-03
Fr
e
drik Kuivine
n
New test case: Criss-c
r
oss merge
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik
K
uivinen
New test case:
m
e
rge
w
i
t
h
directory/f
i
le confli
c
t
s
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
F
redrik Kui
v
inen
test-lib
.
sh
:
A
d
d
new function, test_ex
p
ect_
c
ode
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fred
r
ik
Kuivinen
git
-
merge: Exit w
i
t
h code 2 if n
o
strategy w
a
s able
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-20
Fredrik
Kuivinen
merge-recursive: Replace 'exc
e
pt:'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
F
r
e
drik Kuivine
n
merge-
r
ecursiv
e
: Use '~'
i
nstead of '_' to s
e
parate
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik K
u
iv
i
nen
merge-recursiv
e
: Add copyright notice
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredri
k
K
u
ivin
e
n
m
e
rge-r
e
cursi
v
e: Indent the output pr
o
per
l
y
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fredrik
Kuivinen
merge-recursive: F
i
x suppo
r
t for
branch names
c
ontain
i
ng
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
F
re
d
rik
Ku
i
vin
e
n
merge-
r
ecursiv
e
: Fix limited outpu
t
of rename messages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-08
Fredrik Kuivinen
m
e
rge-r
e
cursive: Only print relev
a
n
t
rename
messages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-03
F
redr
i
k Kuivine
n
[PATCH
]
Enable and f
i
x support
fo
r
base less merg
e
s
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
F
r
e
d
rik K
u
i
v
inen
[PA
T
CH] Tea
c
h git-ls-files a
b
ou
t
'
--' to denote end
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik Kuivinen
[
P
ATC
H
] Teach the recursiv
e
merge strate
g
y about renames
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik Kuiv
i
nen
[PATCH] Mor
e
descriptive messages
f
or conflict
c
ases
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredr
i
k
Kuivinen
[PATCH
]
r
ecu
r
sive-
m
erge: D
o
n
'
t
print a stac
k
trace
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[PATCH]
U
s
e
the '
d
ie' function w
h
ere it is ap
p
r
o
pri
a
te
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[PATCH] Us
e
a
t
e
mporar
y
index file w
h
en we merge th
e
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fr
e
drik Kuivinen
[PATC
H
]
Adjust git-
m
e
r
ge-rec
u
rsive
.
py for the new tool
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[PAT
C
H] Don't output 'Automatic
merge failed,
.
.
.
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[
P
ATC
H
]
B
e
m
ore like the
'
r
esol
v
e' strategy
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fr
e
d
r
ik
Kui
v
inen
[PAT
C
H] R
e
name t
h
e 'f
r
edrik' merge
s
tr
a
tegy t
o
'recursive'
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[PATCH]
M
ak
e
t
he ProgramE
r
ror
class printable
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
F
r
edrik Kuivinen
[PATCH
]
Make sure we die if we do
n
't get
e
n
o
u
g
h
a
rgu
m
e
n
ts
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivin
e
n
[PATCH] Introduce a 'die' functio
n
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fre
d
rik Ku
i
v
i
n
e
n
[PAT
C
H] Exit wi
t
h st
a
t
u
s code 2 if we g
e
t an exception
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[PA
T
C
H] Fix
ass
e
rtio
n
fai
l
ure wh
e
n
m
erging common ancestors
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-04
F
r
edrik Kuivinen
[PA
T
CH] Make git-
a
pply understand incomplete li
n
es
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree