repo.or.cz
/
git
/
trast.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
add clean and ignore rules for xdiff/
2006-03-18
F
r
edrik Kuivinen
Makefile: Add TAGS and tags targ
e
ts
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-17
Fredrik K
u
iv
i
nen
bla
m
e: Fix git-blame <directo
r
y>
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-17
Fredrik
K
uivinen
blame: Nicer output
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-11
F
redrik Kuivi
n
en
b
l
ame: Rename detection (t
a
k
e 2)
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-11
Fre
d
r
i
k Kuiv
i
nen
re
v
-lib: M
a
k
e
it easy to do renam
e
t
r
acking (take 2)
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-11
Fred
r
i
k Kuivinen
Make it po
s
sible
t
o not clobbe
r
object
.
util in so
r
t_in_
t
opol
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-09
Fredri
k
Kuivine
n
Nice
r
output from 'git'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-09
Fredr
i
k Kuivinen
R
emov
e
trailing dot af
t
e
r
short
d
es
c
riptio
n
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-09
Fredri
k
Kuivinen
F
ix some inconsistencies in
t
h
e
do
c
s
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-06
Fre
d
r
ik Kuivi
n
e
n
gi
t
-bla
m
e: Us
e
the same tests for
g
it-blame as fo
r
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-05
Fre
d
ri
k
Kuivinen
gi
t
-blame:
Make
the output human readable
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-02
Fr
e
drik Kuivi
n
en
git
-
blame, t
a
ke 2
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-21
Fredrik Kuivinen
Ad
d
git-bl
a
m
e
, a
tool
f
o
r
assigni
n
g bl
a
m
e
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-14
F
r
edr
i
k
K
uivi
n
en
s/S
H
E
L
L
/SH
E
LL_PA
T
H/ in Makefile
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-02
Fredrik Kuivinen
merge-recursive:
Spee
d
u
p
c
o
mmit graph construction
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-02
Fredrik Kuivinen
merge-
r
ecur
s
ive: Make use of pro
v
ided
bas
e
s
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
Fredr
i
k Kuivinen
git-b
r
anch: Documentati
o
n fixe
s
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
Fredrik Kui
v
inen
merge-recursive: Impro
v
e t
h
e
error
me
s
sage printed
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fredrik Kuivinen
g
i
t-what
c
h
a
n
g
ed: Add us
a
ge
s
t
ri
n
g
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fredrik Kuivine
n
git-log:
A
d
d
usage string
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fredrik Kuiv
i
nen
git-diff:
U
s
age string clean-up
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-14
Fredrik Kuivinen
Usage message clean-up, take #2
commit
|
commitdiff
|
tree
2005-12-03
F
redrik Kuivinen
New
t
est cas
e
: Criss-cross merge
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fr
e
drik Kuiv
i
nen
New test case
:
m
e
rge
w
i
t
h directory/fi
l
e conflicts
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Kuivinen
t
est-lib
.
sh: Add new function, t
e
st_e
x
pect_code
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Kui
v
inen
git-merg
e
:
Exi
t
w
i
th cod
e
2 if no strateg
y
was able
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-20
Fr
e
d
r
i
k
Ku
i
vinen
merge-recursive: R
e
p
lace 'except:'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik Kuivinen
m
erge-re
c
u
r
s
i
ve: Use '~'
i
n
s
tead of '_' to separate
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
F
redr
i
k
K
uivinen
merge-r
e
cursive: Add copyright notice
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fr
e
drik K
u
iv
i
nen
merge
-
recursive: Indent the output
properly
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fre
d
ri
k
Kuivinen
m
erge-r
e
c
ursive: Fix sup
p
ort for b
r
anch names
c
on
t
aining
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fredrik Kuivinen
me
r
ge-recu
r
si
v
e: Fix li
m
it
e
d
output of
renam
e
messages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-08
Fredrik
K
u
i
v
i
n
en
merge-r
e
cursi
v
e:
O
nly p
r
int re
l
evant ren
a
me messages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-03
Fr
e
drik Kuivine
n
[
P
ATCH] Ena
b
le and
fix su
p
port for
b
a
s
e
less m
e
rges
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fred
r
ik Kuivinen
[P
A
T
CH] Tea
c
h git-ls-
f
ile
s
about '--'
to denote e
n
d
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
F
redri
k
Kuivinen
[
PATCH]
T
e
a
c
h th
e
r
ecursive me
r
ge
str
a
t
egy ab
o
ut rename
s
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik Kuivine
n
[PATC
H
] M
o
re
d
escrip
t
ive m
e
s
s
a
ges for con
f
l
i
ct cases
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredri
k
Kuivinen
[PA
T
CH] recursive-mer
g
e: Don'
t
pri
n
t a stack trace
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
redrik
Kuivinen
[PAT
C
H] U
s
e the 'die' fu
n
ction whe
r
e i
t
is
a
ppropriate
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fre
d
rik Kuivinen
[PATCH] Use a temporary in
d
ex file when we merge the
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[PATCH] Adjust git
-
m
e
r
g
e-recursi
v
e
.
py
for the
n
ew to
o
l
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Ku
i
vinen
[PATCH] Don
'
t output 'Aut
o
matic
m
erge faile
d
,
.
.
.
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fred
r
ik K
u
ivinen
[PAT
C
H
]
Be more like the 're
s
olve' strategy
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kui
v
inen
[PATCH] Rename the 'fredrik' merge strat
e
gy
t
o 'rec
u
rsive'
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fre
d
rik K
u
ivin
e
n
[PATCH] Mak
e
the
Pro
g
ra
m
Error class printable
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
F
r
edri
k
K
u
i
v
inen
[P
A
TCH] Ma
k
e sure we die
if
w
e
don
'
t get
e
nough arguments
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
F
r
e
drik
Kuivine
n
[PATCH
]
I
n
t
r
od
u
ce a 'die
'
function
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
F
r
edrik Kuivinen
[P
A
T
C
H
]
E
xit with stat
u
s c
o
d
e 2 if we
g
et an except
i
on
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kui
v
inen
[PA
T
CH] Fix assertion f
a
ilure when merging common
ancestors
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-04
Fredrik Kuivine
n
[PATCH] Make git-app
l
y understand incomplete l
i
n
es
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree