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
diff-patch: Avoid emitting double-slashes in textual patch.
2007-02-23
Fredri
k
Kuivinen
Fix 'git commit -a
'
in a newl
y
i
nitialized reposito
r
y
Signed-off-by:
Fredrik Kuivinen
<frekui@gmail.com>
commit
|
commitdiff
|
tree
2007-02-18
Fredrik
Kuivinen
Docume
n
tation/i18n
.
t
x
t: it is i18n
.
commitencoding not
.
.
.
Signed-off-by:
Fredrik Kuivinen
<frekui@gmail.com>
commit
|
commitdiff
|
tree
2007-02-18
Fr
e
d
r
ik Kuivine
n
Read the
c
onfig in r
e
v-list
Signed-off-by:
Fredrik Kuivinen
<frekui@gmail.com>
commit
|
commitdiff
|
tree
2007-01-06
Fredrik Kuivinen
i
n
staweb: Nice
r
error message
w
hen the http daemon
.
.
.
Signed-off-by:
Fredrik Kuivinen
<frekui@gmail.com>
commit
|
commitdiff
|
tree
2006-06-17
F
red
r
i
k
Kuivinen
blame
:
Ad
d
--time to produce ra
w
timestamps
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-05-16
Fredrik
K
u
i
vinen
Update the documentation
f
or git-
m
erge
-
b
a
s
e
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-05-04
Fred
r
ik Kuivinen
blame:
F
ix path prun
i
ng
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-18
Fredrik Kui
v
inen
Makefile: Add T
A
GS and
tags targets
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-17
Fredrik Kuivinen
blame: Fix git-
b
lame <direc
t
ory>
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-17
Fr
e
drik
K
uivin
e
n
bla
m
e
: Nicer output
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-11
Fredrik Kuivinen
blame: Rename detec
t
i
o
n (
t
ak
e
2
)
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-11
Fredrik Kuiv
i
nen
r
ev-lib
:
M
ake
i
t easy to do r
e
name tracking (t
a
k
e
2)
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-11
Fredrik Kuivine
n
Make it po
s
sible to not clobber obj
e
ct
.
u
t
il in
s
ort_in_topol
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-09
Fredrik
Kuivin
e
n
Ni
c
er output
from 'git'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-09
F
redrik K
u
ivin
e
n
R
e
m
ove trailing dot after short des
c
ript
i
on
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-09
Fredrik
K
uivinen
Fix some inconsistencies in the
docs
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-06
Fre
d
rik Ku
i
v
i
nen
gi
t
-blame:
U
se the same
t
ests f
o
r
git-blame as for
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-05
Fre
d
rik Kuivinen
git-blame: Make
the ou
t
put
h
uman reada
b
le
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-02
Fredrik Kuivinen
g
i
t-blame, take 2
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-21
Fredrik Kuivi
n
en
Ad
d
git-bl
a
me,
a
tool for assigning
bl
a
me
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-14
Fredr
i
k Kuivinen
s/S
H
ELL/SHELL_PATH/
in Makefile
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-02
Fredrik
K
u
ivi
n
en
merge-r
e
c
ursive: Speed up commit grap
h
constr
u
c
tion
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-02
Fredrik Kuivinen
merge-recur
s
ive
:
M
ake
u
se
of pro
v
ided
b
ase
s
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
Fredrik Ku
i
vinen
git-branch: Documentat
i
on
fixes
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
F
redrik Kuivinen
merge-re
c
ursive: Improve the error message printed
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fr
e
dri
k
Ku
i
vinen
g
i
t-whatchanged
:
Add usage
string
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fredrik Kuivinen
gi
t
-log: Add usage
string
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fredrik Kuivinen
git-
d
iff: Usage string clea
n
-up
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-14
Fredrik Kuivinen
U
s
age
message
c
l
e
a
n-up, take #2
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Kuivin
e
n
New te
s
t case: Criss-
c
ro
s
s
mer
g
e
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
F
r
e
drik K
u
ivin
e
n
New
test case: merge
with directory/file conflicts
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredr
i
k
Kui
v
inen
test-lib
.
sh: Add new f
u
nction, test
_
expect
_
co
d
e
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredr
i
k Kuivinen
gi
t
-merge: Exit with code 2 if no
s
trategy was abl
e
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-20
Fredrik K
u
ivin
e
n
merge-
r
e
cursive: Replace 'except:'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik Kuivinen
mer
g
e
-rec
u
rsive: Use
'
~' instead of '_' to separate
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredr
i
k
K
u
i
vinen
merge-recursive
:
Add co
p
yri
g
h
t notice
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fr
e
drik Kuivinen
merge-recursive
:
Indent t
h
e out
p
ut properly
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fredrik Kuiv
i
nen
mer
g
e-recursive:
F
ix sup
p
o
r
t for branc
h
n
ames
c
ontain
i
ng
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fredri
k
Kuivinen
merge-recursive
:
F
ix
li
m
it
e
d outpu
t
of rename messages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-08
F
redrik Ku
i
v
inen
m
erge
-
recursive: Onl
y
print relev
a
n
t
r
en
a
me messa
g
es
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-03
F
r
edrik Kuivinen
[
PATCH] Enable
an
d
f
ix support for base less m
e
rges
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fre
d
r
ik Kuivinen
[PATCH] Teach git-ls-f
i
les about '--' t
o
denot
e
end
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
F
redr
i
k Kuivinen
[PATCH] Teach the recurs
i
ve merge strategy a
b
out
r
enames
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fre
d
rik Kuivinen
[P
A
TCH]
More descriptive
m
essag
e
s
for co
n
f
l
i
c
t cases
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik Kuivinen
[PATCH]
rec
u
rsive-merge: Don't print
a
stack
t
race
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredr
i
k Kuivinen
[
PATC
H
] Us
e
th
e
'
d
ie' functio
n
wher
e
it is app
r
opriate
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
redrik K
u
ivinen
[PATCH] Use a temporary index
f
il
e
when we m
e
rge th
e
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
r
edrik Kuivinen
[PATCH]
A
d
j
u
s
t git-merge-recursiv
e
.
p
y
fo
r
the ne
w
tool
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik
Kuivinen
[PATCH] Don't
o
u
tput 'Automatic merge failed,
.
.
.
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[PATCH] Be more l
i
k
e the
'resolve' strateg
y
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
redrik Kuivinen
[PAT
C
H
] Ren
a
me the 'fred
r
ik' me
r
ge st
r
a
t
egy to 'recursive'
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fr
e
drik Kui
v
inen
[P
A
TCH] M
a
ke the Prog
r
amErro
r
class printable
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[
P
A
TCH] Make su
r
e we die if we
d
on't get enough arguments
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fred
r
ik Kuivinen
[P
A
TCH] Introduce
a
'die' functio
n
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[PATCH] Exit with
status code 2 if
we get an
exception
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredr
i
k Kuivine
n
[PATCH] Fix a
s
ser
t
ion f
a
ilu
r
e when merging common ance
s
tors
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-04
Fredrik Kuivinen
[PA
T
CH] M
a
k
e git-apply
u
nde
r
stand incomp
l
ete
l
in
e
s
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree