repo.or.cz
/
git
/
debian.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Some more memory leak avoidance
2006-06-17
Fredrik
K
u
ivine
n
blame: Add
--time to produce r
a
w time
s
ta
m
p
s
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-05-16
Fredrik Kuivinen
Update
t
h
e
docum
e
ntation
f
or git-merge-base
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-05-04
Fredrik
K
uivine
n
blame:
F
i
x path
p
ru
n
i
ng
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-18
Fredrik Kuivinen
Makefile: Add TAGS and tag
s
targets
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-17
Fre
d
r
i
k
K
uivinen
bla
m
e: Fi
x
git-blame <di
r
ector
y
>
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-17
Fredrik Kuivinen
b
lame
:
Nicer output
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-11
Fre
d
rik Kuivin
e
n
blame: Rename det
e
ct
i
on (take 2)
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-11
Fredrik
K
uivinen
r
e
v-lib:
M
ake it easy to
d
o ren
a
me
t
r
a
ckin
g
(
take 2)
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-11
Fredrik Kuivinen
M
a
ke it possible to not clobber obj
e
ct
.
util in sort_in_topol
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-09
Fredrik K
u
ivinen
Ni
c
er
output
f
r
o
m
'
g
it
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-09
Fredri
k
Kuivinen
R
emove
t
rail
i
ng dot after shor
t
description
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-09
Fredri
k
Kuiv
i
n
e
n
Fix som
e
inconsistencies i
n
the
docs
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-06
Fre
d
rik Kuivi
n
en
git-blam
e
: Use
t
he same tests f
o
r git-b
l
ame as for
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-05
F
red
r
ik Kuivine
n
git-blame: Make t
h
e output human r
e
ad
a
ble
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-02
Fredrik K
u
ivinen
git-blame, t
a
ke 2
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-21
Fred
r
ik K
u
i
v
in
e
n
Ad
d
gi
t
-blame, a tool for ass
i
g
n
in
g
blame
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-14
Fre
d
rik Kuivinen
s/
S
H
ELL/SHELL_
P
ATH/
in
M
akefile
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-02
Fredrik Kuivinen
merge-re
c
ur
s
ive: Speed up
c
ommit gra
p
h
c
onstruction
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-02
F
r
e
drik K
u
ivi
n
en
merge-
r
ecursive: Mak
e
use of
pro
v
i
ded bases
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
Fredrik Kuivinen
git-branch
:
Documenta
t
ion fix
e
s
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
Fre
d
rik Kuivinen
m
erge-recur
s
ive: Imp
r
ove the
error m
e
ssage
p
rinted
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fredrik Kuivinen
git
-
whatcha
n
g
e
d
: Add usage string
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fred
r
ik Kui
v
inen
git-log: Add usage st
r
i
n
g
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
F
redrik Kuivinen
gi
t
-d
i
ff: Usage
s
tring clean-up
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-14
Fredri
k
Kuivinen
Usage message clean-
u
p
,
take #2
commit
|
commitdiff
|
tree
2005-12-03
F
r
e
dr
i
k
Kuivinen
New test case:
Criss-cros
s
merge
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fred
r
ik
Kuivin
e
n
New tes
t
case: merge with
d
irec
t
or
y
/file conflict
s
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fred
r
ik Kuivinen
test-lib
.
sh: Add ne
w
function, test_
e
xpect_cod
e
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Kuiv
i
ne
n
git-merge:
E
xit with c
o
de 2 if no st
r
a
tegy was able
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-20
Fredrik Kui
v
in
e
n
merg
e
-recursive: R
e
pl
a
ce 'except:'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik Kuivinen
merge-recursive: Use '~' instead of '_' to
s
eparat
e
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik Kuivinen
merge-re
c
ursiv
e
: Ad
d
cop
y
right notice
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik K
u
ivinen
merge-recursive: Indent t
h
e output pr
o
perly
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fredrik Kuivinen
merg
e
-rec
u
rsi
v
e: Fix s
u
p
p
ort for branch names containing
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
F
r
ed
r
i
k K
u
ivine
n
merge-recursive:
Fix l
i
mite
d
output of rename mess
a
ges
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-08
Fredrik Kuivinen
merge-recursive: Only print relevant rename messa
g
es
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-03
F
red
r
i
k
Kuivine
n
[PATCH
]
Enable an
d
fix support for base
l
ess m
e
rges
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik
Kuivinen
[P
A
T
CH] Te
a
ch git-ls-files about
'--
'
to
d
e
n
ote end
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik Kuiv
i
n
e
n
[PATCH] Teach the recursive mer
g
e strategy a
b
out ren
a
mes
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik
K
u
i
vinen
[PATCH
]
Mo
r
e
descrip
t
ive m
e
ssages for conflict cases
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik Kuivinen
[PATCH] recursi
v
e-m
e
rge: Don't print a stack
t
race
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fre
d
r
i
k Kuivinen
[PATC
H
] Use the 'di
e
' function
w
he
r
e it is appropriate
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
r
e
d
r
ik Kuivin
e
n
[P
A
TCH] Use a tempo
r
ary ind
e
x file
when
we merge the
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivin
e
n
[PATCH] Adjust
g
it-merge-r
e
cursi
v
e
.
py for the new tool
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[PATCH]
D
on't ou
t
put 'Automatic m
e
rge faile
d
,
.
.
.
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivi
n
en
[
PA
T
CH] Be more like the
'
resolve' strategy
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik
Ku
i
v
inen
[PATC
H
]
Ren
a
me the '
f
redrik' me
r
ge stra
t
egy to 'recursiv
e
'
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik K
u
ivinen
[
P
ATCH] Make the ProgramError class printable
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[PATCH] M
a
ke sure we
die
i
f
w
e do
n
't ge
t
enough argumen
t
s
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredr
i
k Kuivinen
[
PATCH] Introduce a 'd
i
e' funct
i
on
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[PA
T
CH] Exit
w
ith status code 2 if
we
get an
e
x
c
e
p
tion
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fre
d
ri
k
Kuivinen
[PATCH] Fix
a
sser
t
ion f
a
ilure
w
he
n
merging common ancestor
s
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-04
Fredrik Kui
v
i
n
en
[PATCH] Mak
e
git-apply under
s
tand incomplete lines
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree