repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
cvsimport: ignore CVSPS_NO_BRANCH and impossible branches
2006-06-17
F
r
edrik Kuivinen
blame: Add --
t
ime to
p
r
o
duce raw timestamps
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-05-16
Fredrik Kuivinen
Updat
e
the doc
u
mentation for
git
-
merge
-
base
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-05-04
Fre
d
rik Kuivinen
blame: Fix path
p
runi
n
g
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-18
F
redrik Kuivinen
Makefil
e
: Add T
A
GS and tags targets
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-17
Fredrik Kuivi
n
e
n
blame: Fix git-blame <directory>
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-17
Fred
r
ik
Kuivinen
blame: Nicer
o
u
tput
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-11
Fr
e
d
r
ik Kui
v
inen
blame: Re
n
ame
d
etection (take 2)
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-11
Fredri
k
Kuivinen
rev-lib: Make
i
t eas
y
to do rename
tracking (take
2
)
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-11
Fredrik Kuivinen
M
a
ke it pos
s
i
ble to not clobbe
r
object
.
uti
l
in sort_i
n
_to
p
ol
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-09
Fredrik
Kuivinen
Nic
e
r o
u
tput from '
g
i
t
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-09
Fredrik Kuivinen
Remove trailing do
t
a
f
ter short des
c
ription
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-09
Fredri
k
Ku
i
vinen
Fi
x
some incon
s
ist
e
ncies in the docs
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-06
F
redri
k
Kuivinen
git-blame: Use the same test
s
for git-bla
m
e
a
s
f
or
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-05
Fredrik Kuivi
n
en
git
-
blame: Make the output human re
a
dab
l
e
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-02
Fredri
k
Kuivinen
git-blame
,
take 2
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-21
F
redrik
K
uivinen
Add git-
b
lame, a tool
for
assigning bl
a
me
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-14
Fredrik Kuivinen
s
/
SHELL/SHELL_P
A
T
H/ in M
a
kefil
e
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-02
F
r
e
drik
Kui
v
inen
merge-rec
u
rs
i
ve: Speed up commit
g
r
aph construction
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-02
Fred
r
ik Kuivinen
merge-r
e
cursive: Make u
s
e of provided base
s
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
Fredri
k
Kuivin
e
n
git-branc
h
: Documentat
i
on fix
e
s
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
F
re
d
rik Kuivinen
merge-recursive: Improve the error messa
g
e
p
r
inted
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fredrik Kuivinen
git-whatchanged: Add us
a
ge
s
tring
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fredrik Kuivinen
git-
l
og
:
A
dd usage string
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fredrik
K
uivinen
git-dif
f
: Usage str
i
ng c
l
ean-u
p
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-14
Fredrik Kuivinen
Usage messag
e
clean-up, take #2
commit
|
commitdiff
|
tree
2005-12-03
F
redrik Kuivinen
New test case
:
Cri
s
s-cross merge
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik
K
uivinen
New test case
:
merge with dir
e
ctory
/
file
c
onflicts
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fre
d
rik Kuivinen
te
s
t-lib
.
sh:
Ad
d
new f
u
ncti
o
n
,
tes
t
_
e
x
p
e
ct_
c
od
e
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
F
redrik
K
uivinen
git-m
e
rge:
E
xi
t
with
c
ode
2 if no st
r
a
t
eg
y
w
as able
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-20
F
r
e
drik K
u
ivinen
mer
g
e-recursive: Replace 'excep
t
:
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik Kuivinen
m
erg
e
-recurs
i
ve: Use '~' instead o
f
'_'
to
separate
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fred
r
i
k Kui
v
inen
merge-recursive: Add copyright no
t
ice
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
F
re
d
rik Kuivinen
mer
g
e-recursive: Inde
n
t the output properly
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
F
r
ed
r
ik Kuivin
e
n
mer
g
e-recursive: Fix s
u
p
port f
o
r branch na
m
es con
t
aining
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fredr
i
k Kuiv
i
ne
n
merge-recur
s
ive: Fix l
i
m
i
ted
o
u
tput o
f
r
e
n
a
m
e messages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-08
Fredrik
K
u
i
vin
e
n
merg
e
-recursive: Only
p
rint relev
a
nt re
n
a
me messa
g
es
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-03
Fredrik Kuivi
n
e
n
[PATC
H
] Enabl
e
and f
i
x
support
for ba
s
e le
s
s
m
erges
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredr
i
k
Kuivine
n
[PATCH
]
Teach
git-ls-files about '--'
t
o
denote end
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
F
redrik
K
uivi
n
en
[
P
A
TCH] Teach the recur
s
ive merge s
t
rategy about renam
e
s
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
F
r
edrik Kuivinen
[
PAT
C
H] More descriptive m
e
ssages for conflict cas
e
s
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik Kuivinen
[
PATCH]
recur
s
ive-mer
g
e:
Don't
p
r
i
nt a s
t
ack trace
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[PATCH]
U
se t
h
e 'die
'
funct
i
on wher
e
it is appropr
i
a
te
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fre
d
rik Kuivinen
[PATC
H
] Use
a
t
em
p
orar
y
index file when we
m
erge th
e
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fre
d
r
i
k Kuivinen
[PATCH] Adjust git-merge-recursive
.
py for t
h
e new tool
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[P
A
TC
H
] Don't out
p
ut 'Automatic mer
g
e fai
l
ed,
.
.
.
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fr
e
dri
k
Ku
i
vinen
[
P
A
TCH] Be more l
i
ke the '
r
esolv
e
' strategy
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik K
u
ivine
n
[
P
ATCH]
R
ename the 'fredrik' m
e
rge st
r
a
t
e
gy to 'rec
u
rsiv
e
'
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fred
r
ik Kui
v
i
n
en
[
P
ATCH] Ma
k
e the P
r
ogramEr
r
or class printable
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredr
i
k
Kuivinen
[
P
ATCH] Ma
k
e
s
u
r
e
w
e di
e
if w
e
d
o
n't
get enough argu
m
ents
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik
K
uivinen
[
PATCH] Introduce a 'd
i
e' function
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredr
i
k Kuivinen
[PATCH] Exit
with
st
a
tus co
d
e 2 i
f
we get an exce
p
t
i
o
n
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
F
r
edrik Kuivinen
[PATCH] Fix assertion failure
w
hen mer
g
ing com
m
on a
n
cestors
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-04
Fredri
k
K
ui
v
inen
[
PATCH] Make git-apply under
s
ta
n
d inco
m
plete lines
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree