repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Revert "builtin-grep: workaround for non GNU grep."
2006-05-16
Fredrik Kuivinen
Up
d
at
e
the do
c
um
e
ntation
f
or
g
it-merg
e
-base
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-05-04
Fredrik K
u
ivinen
blame
:
Fix path pruning
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-18
F
redrik Kui
v
inen
Makef
i
le: Add TAGS and tags target
s
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-17
Fr
e
drik K
u
ivinen
bla
m
e:
F
ix git-bl
a
me <directory
>
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-17
Fredrik Kuivinen
bl
a
m
e
: N
i
cer
o
utput
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-11
F
r
edr
i
k Kuiv
i
nen
blame:
R
ename dete
c
ti
o
n (ta
k
e
2)
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-11
Fredri
k
Ku
i
vinen
rev-lib: Make it
e
asy to do
r
e
na
m
e
tracking (
t
ake 2)
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-11
Fredrik
Kuiv
i
nen
M
a
ke it po
s
sible to not cl
o
bber object
.
util in
sort_in_t
o
pol
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-09
Fredrik Ku
i
vin
e
n
Nicer output from 'git
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-09
Fredri
k
Kuivinen
Remove trailing dot after short descri
p
tion
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-09
F
r
e
d
rik Kuivinen
F
i
x some inco
n
sistencies in the d
o
c
s
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-06
Fredrik Kuivine
n
git-bl
a
me: Use th
e
same tests f
o
r git-b
l
ame
as f
o
r
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-05
Fredrik Kuivinen
gi
t
-blame: Make the outpu
t
human
r
eadable
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-02
F
r
edri
k
K
u
ivinen
git-blame, take
2
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-21
Fredrik Kuivinen
A
dd
g
it-blame, a to
o
l for
a
s
s
igni
n
g
blame
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-14
Fredrik Kui
v
inen
s/SHELL
/
SHELL_
P
AT
H
/ in Makefile
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-02
Fredrik Kuivinen
merg
e
-recursive: Spee
d
up commit
g
r
a
ph
c
onstruction
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-02
F
redrik K
u
ivinen
merge-recursive: Make use of p
r
o
vided
bases
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
Fredr
i
k K
u
ivi
n
en
git-branch: Documen
t
ation
f
i
xes
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
F
redrik
K
uivinen
merg
e
-r
e
cursi
v
e: Im
p
r
o
ve
t
he
e
r
ror messa
g
e
pri
n
t
ed
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fredrik Kui
v
inen
git-whatchanged:
A
dd
u
s
age string
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fredrik Kuiv
i
nen
git-
l
og: Add
u
sage string
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fredrik Kuiv
i
nen
gi
t
-
d
iff: Us
a
ge stri
n
g clean-up
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-14
Fredri
k
Kuivinen
U
sage m
e
ssage
c
l
ean-up, take #2
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Kuivinen
Ne
w
test
c
ase: Criss-cross me
r
ge
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredr
i
k Kuivinen
New test case: merge with directory/file conflicts
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Kuivinen
test-lib
.
s
h:
Ad
d
new f
u
n
ction, test_exp
e
ct_code
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fr
e
d
r
ik Kuivinen
git-merg
e
: Exit with co
d
e 2
i
f
no s
t
rategy was able
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-20
Fredrik
Kuivinen
merge
-
re
c
u
rsive: Replac
e
'ex
c
ept:'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredr
i
k Ku
i
vinen
merge-recursive:
U
se '~'
i
n
s
tead
of '_' to se
p
ara
t
e
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik Kuivinen
merge-rec
u
rsive
:
Add copyright notice
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fre
d
rik
K
u
i
v
inen
merge-recursiv
e
:
Indent the
o
ut
p
ut properly
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fredr
i
k
K
uivinen
m
erge-recursive: Fix support for branch
names co
n
taining
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fredrik Kui
v
inen
m
e
rge-recursive: Fix
l
imited
o
u
t
put of rena
m
e messa
g
es
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-08
Fredrik Kuivinen
m
erge
-
r
e
cursive: Only print
relev
a
nt r
e
n
ame messag
e
s
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-03
Fredri
k
Kuivinen
[PATCH] E
n
a
ble
a
nd fix support for
b
a
se less
m
e
r
ges
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik
Ku
i
v
inen
[P
A
TCH] Teach
git-l
s
-files about '--' to denote e
n
d
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
F
r
edri
k
Kuivinen
[PATCH] Te
a
ch th
e
recursive merge str
a
tegy about renames
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
F
r
edr
i
k Kuivi
n
en
[PATCH] More d
e
scriptive messages for conflict
c
ases
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fre
d
rik Kuivinen
[
PATCH] recursive-
m
erge: Don't print a
st
a
c
k
trace
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[PA
T
CH
]
Use
t
h
e 'die'
funct
i
on
w
here it is appro
p
riate
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivine
n
[PA
T
CH
]
Use a tempora
r
y ind
e
x file when
w
e merg
e
t
h
e
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fred
r
ik
K
u
ivine
n
[PATCH]
Adjust git-
m
erg
e
-recursive
.
py for th
e
new tool
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik
K
uivinen
[
P
ATC
H
] Don't
o
utput 'Automatic merge fa
i
led
,
.
.
.
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[PATCH] B
e
more
l
ike
the 'r
e
solve
'
st
r
ategy
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fr
e
d
r
ik
K
uivinen
[P
A
TCH] Rename
the 'fredrik' merge stra
t
egy
to '
r
e
cursive'
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
F
r
e
d
ri
k
Kuivine
n
[
P
ATCH] Mak
e
the ProgramE
r
r
o
r class pr
i
nt
a
ble
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fre
d
rik Kuivin
e
n
[PATC
H
]
M
ake sure w
e
die
i
f we don
'
t get enough
a
rgu
m
ent
s
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik K
u
ivinen
[
P
ATCH]
Introduc
e
a
'
die
'
function
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
F
r
e
d
r
i
k Ku
i
vinen
[PATCH] Exit
with stat
u
s
c
ode 2 if
w
e get an
ex
c
eptio
n
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
F
r
edri
k
Kuiv
i
ne
n
[
PA
T
CH] F
i
x assertion failure
whe
n
me
r
gi
n
g common ancestors
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-04
Fredrik Ku
i
vinen
[PATCH] Mak
e
git
-
apply und
e
r
stand incomplete lines
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree