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
git-commit: do not fail to print the diffstat even if there is a file named HEAD
2007-01-06
Fred
r
ik Ku
i
vi
n
en
i
n
staw
e
b:
N
icer e
r
ror mess
a
ge whe
n
the
h
tt
p
daem
o
n
.
.
.
Signed-off-by:
Fredrik Kuivinen
<frekui@gmail.com>
commit
|
commitdiff
|
tree
2006-06-17
F
r
e
d
r
i
k
Kuivi
n
en
blame:
Add
--time
t
o produce raw timestamps
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-05-16
Fredrik
Kuivin
e
n
Upda
t
e the documentatio
n
f
o
r git-merge-b
a
se
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-05-04
Fr
e
drik Kuivi
n
e
n
blame: Fix path pruning
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-18
Fredr
i
k K
u
ivi
n
en
Makefile: Add
T
AGS
a
n
d tags targets
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-17
F
redrik
Kuivinen
blame:
Fix git-blame <directory>
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-17
F
redrik
Kuivinen
b
l
ame: Nice
r
output
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-11
Fredrik Kuivinen
b
l
ame:
Renam
e
detection (t
a
ke 2)
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-11
Fredrik
K
uiv
i
nen
r
e
v-
l
ib: M
a
ke it easy to
d
o rename trac
k
ing (take 2)
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-11
Fr
e
drik K
u
ivine
n
Ma
k
e
it p
o
ssib
l
e to
n
ot clobber object
.
ut
i
l i
n
sort_in
_
top
o
l
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-09
Fredrik K
u
iv
i
nen
N
ic
e
r outpu
t
from 'git'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-09
Fred
r
ik Ku
i
vinen
Remove t
r
ail
i
ng d
o
t after sho
r
t d
e
s
c
ri
p
tion
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-09
Fredrik K
u
ivinen
Fix
som
e
inconsi
s
tenci
e
s in t
h
e
docs
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-06
Fred
r
ik
Kuivi
n
en
g
it-blame: Use the same test
s
for git-blame as for
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-05
Fredrik Kuivinen
git-blame
:
M
a
k
e
t
h
e outpu
t
h
u
m
a
n
readable
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-02
Fredrik Kuivinen
git-blame, take 2
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-21
Fr
e
drik Kui
v
i
nen
Add git-blame, a tool for ass
i
gnin
g
blame
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-14
Fredrik Kuiv
i
nen
s/SHELL/SHELL_PA
T
H
/ in Make
f
ile
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-02
Fredr
i
k Kuivi
n
en
me
r
g
e-recursive: Spee
d
u
p
c
o
m
m
it graph construction
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-02
Fredrik Kuivinen
me
r
ge-re
c
ursive:
Ma
k
e use of
p
rovided bases
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
Fredrik Kuivinen
git-branch: Documentation
fixes
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
Fredrik Kui
v
inen
merge-recursive: Imp
r
ove the
er
r
or
message printed
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
F
r
edrik Kuivine
n
git
-
whatchan
g
e
d
: A
d
d us
a
ge string
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fredrik Kuiv
i
ne
n
git-lo
g
:
A
dd usage st
r
in
g
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fredrik
Ku
i
vinen
g
i
t
-d
i
ff: Usage string
c
l
e
a
n-u
p
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-14
Fredr
i
k
Kuivinen
Usage mess
a
ge
clean-up, t
a
ke #2
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Ku
i
vinen
New test case: Criss-cr
o
ss
merge
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fred
r
ik Kuivinen
New test
case: merge w
i
th d
i
rectory/fil
e
conflicts
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Kuivinen
te
s
t
-
lib
.
sh: Add ne
w
f
unction, test_expect_
c
ode
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredri
k
K
u
ivinen
g
it-merge: Exit with code 2 i
f
no
strategy was able
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-20
Fredrik Kuivinen
merge-recursive: Replace 'exce
p
t:'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik Kuiv
i
nen
merge-rec
u
rsive: Use '~' instead
o
f '_' to separate
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fre
d
rik
Kuivinen
merge
-
re
c
ursive: Add cop
y
right notice
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredr
i
k Kuivinen
mer
g
e-recursive: Indent
t
he output properly
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fr
e
dri
k
Ku
i
vinen
merge-re
c
ur
s
ive: Fix su
p
port
for
b
ranch names
c
o
n
tai
n
ing
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fre
d
rik Kuivi
n
en
merge-recursi
v
e: Fix
l
imited out
p
ut of rename messages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-08
Fredrik Ku
i
vine
n
mer
g
e
-
recursive:
O
nly print rele
v
ant rename messages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-03
F
r
e
drik Kuiv
i
nen
[PA
T
CH] Enable and
f
ix support f
o
r base less merges
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik Kuivinen
[PAT
C
H] Teach g
i
t-ls
-
f
i
l
es a
b
out '-
-
' to d
e
note en
d
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
F
r
edrik
K
ui
v
inen
[
P
ATCH] Teach the recursiv
e
merge st
r
at
e
gy about re
n
ames
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik Kuiv
i
n
en
[
PATCH] More descrip
t
ive messages fo
r
conflict
ca
s
es
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
F
r
edrik Kuivin
e
n
[P
A
TCH] recursive-merge:
Don't prin
t
a
s
tack tra
c
e
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[
P
ATCH] Use the 'die' function where
i
t
is a
p
propriate
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
redrik Kuivinen
[PATCH]
Us
e
a temp
o
rary index f
i
l
e when we merge the
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik
Kuivine
n
[PATCH] Adjust git-merge-recursive
.
py f
o
r th
e
new tool
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fr
e
d
r
ik Ku
i
vin
e
n
[PATCH] Do
n
't output
'Aut
o
mat
i
c merge
f
ailed,
.
.
.
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fre
d
rik Kuivinen
[PATCH] Be more like the 'resol
v
e' strategy
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fred
r
i
k Kuivi
n
e
n
[PATCH
]
R
ename the 'f
r
edrik
'
m
e
r
ge strat
e
gy to 'recursive'
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fr
e
drik Kuivi
n
en
[P
A
TCH] Make the Prog
r
amErro
r
cl
a
ss pri
n
tab
l
e
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivine
n
[
P
ATCH
]
Make
sure we
d
i
e if w
e
don't get
e
nou
g
h arguments
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuiv
i
nen
[PATCH]
I
ntroduce
a '
d
ie' f
u
nction
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik K
u
ivinen
[PATCH] Exit wit
h
s
t
atus code
2
if we
ge
t
a
n e
x
c
e
ption
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik
K
uivinen
[PATCH] Fix as
s
ertion failure w
h
en merging c
o
mmon an
c
estors
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-04
Fredrik Kuivinen
[PATCH] Make gi
t
-apply un
d
er
s
tand in
c
omplet
e
l
i
nes
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree