repo.or.cz
/
git
/
raj.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'js/diff-color-check'
2007-02-18
Fredrik Kuivinen
Do
c
umentation
/
i
1
8
n
.
t
xt: it is i1
8
n
.
c
o
mmitencoding not
.
.
.
Signed-off-by:
Fredrik Kuivinen
<frekui@gmail.com>
commit
|
commitdiff
|
tree
2007-02-18
F
redrik
K
u
ivine
n
Read
t
h
e config
in r
e
v
-
l
ist
Signed-off-by:
Fredrik Kuivinen
<frekui@gmail.com>
commit
|
commitdiff
|
tree
2007-01-06
Fre
d
rik
Kuivinen
instaweb: Nicer error messa
g
e when
t
h
e
http da
e
mon
.
.
.
Signed-off-by:
Fredrik Kuivinen
<frekui@gmail.com>
commit
|
commitdiff
|
tree
2006-06-17
F
redrik Kuivinen
bl
a
me: Add --time
to
pr
o
duc
e
raw timestamps
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-05-16
Fr
e
drik Kui
v
i
nen
U
pdate t
h
e d
o
cumentation
f
or git-mer
g
e-
b
ase
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-05-04
Fredrik
K
uiv
i
nen
blame
:
F
i
x
path pruning
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-18
Fredr
i
k Kuivin
e
n
Makefile: Add TAG
S
an
d
tags target
s
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-17
Fredrik Kuiv
i
nen
blame: F
i
x git-blame <dir
e
ctory>
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-17
F
r
edrik Kuivine
n
bla
m
e: Nicer o
u
t
put
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-11
Fredrik Kuivinen
blame: R
e
name detection (t
a
ke 2)
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-11
Fredrik Kuivinen
rev-l
i
b: Make it easy to do rename t
r
a
c
k
ing (ta
k
e 2)
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-11
Fr
e
d
rik Kuivinen
M
a
k
e
i
t
p
ossible
to
n
ot clobber ob
j
ect
.
ut
i
l in sort_in_topol
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-09
Fredrik Kuivinen
Nicer output f
r
om 'gi
t
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-09
Fredrik Kuivinen
Remove t
r
ail
i
ng dot afte
r
s
ho
r
t
des
c
ripti
o
n
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-09
Fredrik Kuiv
i
nen
Fix some
i
n
con
s
istencies in the docs
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-06
Fre
d
rik Kuiv
i
nen
git-blame: Use the same tests fo
r
g
it-
b
lame as
for
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-05
F
r
e
drik
K
uivinen
git
-
bla
m
e: Make the outp
u
t h
u
m
an
reada
b
le
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-02
F
redr
i
k Kuivin
e
n
g
i
t
-
b
l
ame,
t
ake 2
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-21
Fredri
k
Kuivinen
Add git-blame, a tool fo
r
as
s
igning
b
la
m
e
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-14
Fred
r
ik K
u
i
v
inen
s/SH
E
LL/SHELL
_
PATH/ in Makefile
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-02
Fredrik Kuivinen
merge-recursive: Speed u
p
commit graph
c
onstruction
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-02
F
r
e
drik Ku
i
vinen
m
erge-recursive: Make
u
s
e
of provi
d
ed b
a
se
s
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
Fredrik Kuivinen
gi
t
-
b
r
anch:
Docu
m
entation fixes
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
Fredrik Ku
i
vinen
merge-recu
r
si
v
e:
I
m
prove the error
message printed
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fredrik Ku
i
vinen
git-what
c
hanged: Add usage string
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fredrik Ku
i
v
inen
g
it-log:
Add
u
s
a
ge string
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fredrik
Kuivinen
gi
t
-diff: Us
a
g
e string clean-up
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-14
F
redri
k
Kuiv
i
nen
Usage m
e
ssage cl
e
an
-
up, ta
k
e #2
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Kuivin
e
n
New test cas
e
:
C
r
iss-cross merge
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
F
r
edrik Kuivinen
New test c
a
s
e
: merg
e
w
i
t
h
direc
t
ory/file conflicts
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik K
u
ivinen
t
est-lib
.
sh: Add new fun
c
tion, test_expect_code
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Kuivinen
git-merge:
Exit
with
c
o
d
e 2 i
f
n
o strat
e
gy was able
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-20
Fredrik Ku
i
vinen
merge-re
c
ursive: Replace 'except
:
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredri
k
Kuivinen
merge-recu
r
s
i
v
e: Use '~
'
instead
o
f '_' to separate
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik Kuivinen
merge-rec
u
rsive:
A
dd
c
opyright noti
c
e
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik Kuiv
i
nen
m
e
r
g
e
-
r
ecursi
v
e: Indent the
o
u
t
put prop
e
r
ly
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fredrik Kui
v
inen
merge-re
c
urs
i
ve:
Fix s
u
ppo
r
t
for
branch n
a
mes c
o
ntaining
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
F
redrik Kuivinen
merge-r
e
c
ursive: Fix li
m
ited ou
t
put of rename message
s
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-08
Fred
r
ik Ku
i
vinen
me
r
g
e
-
recursive:
Only pr
i
n
t relevant renam
e
m
essages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-03
Fr
e
d
r
i
k
Kuivinen
[PATCH
]
Enable an
d
fix support
fo
r
base
l
ess merges
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik Kuivin
e
n
[PATC
H
]
T
each
g
it-ls-files about '--
'
to
denote end
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fred
r
ik Kuiv
i
n
e
n
[
PATCH] Teach the
r
ec
u
rs
i
ve
m
erge
strategy about
renames
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredri
k
Kuivinen
[PATCH
]
M
o
r
e d
e
scriptive messages f
o
r conflict cases
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredr
i
k
K
ui
v
inen
[PA
T
CH] recursive-merge: Don't print a
s
tack trace
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredr
i
k
Kuivinen
[
P
ATCH] Use the '
d
ie
'
fu
n
ction whe
r
e it is appr
o
pria
t
e
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[PATCH] Use a temporary index file when
w
e
merge the
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[
PATCH] Adjus
t
gi
t
-merg
e
-recursive
.
py f
o
r the new tool
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fre
d
ri
k
Kuivi
n
en
[PATCH
]
Don't output
'A
u
tomatic m
e
rge fa
i
led,
.
.
.
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
r
edrik
K
u
i
v
inen
[PATCH] Be m
o
r
e
lik
e
the 're
s
olve' strate
g
y
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fr
e
drik Kuivinen
[
P
ATCH] Rename t
h
e 'f
r
edrik' me
r
ge strat
e
gy to 'r
e
cursive'
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
F
redr
i
k
Kuivinen
[PATCH] Make th
e
Progr
a
m
Error
c
l
a
ss p
r
intable
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
F
r
edr
i
k Kuivinen
[
PATCH]
Make sure we die if we don
'
t get enough arguments
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fred
r
ik Kuivinen
[PAT
C
H] Introduce a 'di
e
' fu
n
ctio
n
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fred
r
ik Kuivinen
[PATCH] Exi
t
with status code 2 if we get an ex
c
eption
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fred
r
ik Kuiv
i
nen
[
P
ATCH] Fix assertion fai
l
ure when
merging common ancestors
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-04
Fredrik
Kui
v
inen
[PATCH] Make git-
a
pply unders
t
and incomplet
e
lines
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree