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
Merge branch 'tojunio' of http://locke.catalyst.net.nz/git/git-martinlanghoff into...
2006-05-04
Fredrik Kuivinen
bl
a
me: F
i
x path pruning
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-18
Fredrik Kuiv
i
nen
M
a
kefi
l
e: Add TAGS and tags targets
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-17
F
r
edrik Kuivinen
blame: Fix git-bl
a
me <dir
e
ctory>
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-17
Fr
e
drik Kuiv
i
nen
blame:
N
i
c
er output
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-11
Fredrik K
u
ivi
n
e
n
blame:
R
en
a
m
e
detection (take
2
)
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-11
Fredrik Kuivine
n
r
ev-lib: Ma
k
e
i
t e
a
sy to do rename tracki
n
g
(
take 2)
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-11
F
r
edri
k
Kuivin
e
n
Make it p
o
ssibl
e
to not
c
lo
b
b
er ob
j
e
c
t
.
util i
n
sor
t
_in_topol
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-09
Fredrik
K
uivinen
Nicer output f
r
om 'git
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-09
Fredr
i
k Kuiv
i
nen
Remove
t
r
ailing dot after short description
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-09
F
redrik Kuivinen
Fix some inconsistencies in the docs
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-06
Fred
r
ik Kuiv
i
n
en
g
it-bla
m
e: Use
t
he same tests for
g
it
-
b
l
ame as for
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-05
F
r
ed
r
ik Kuivinen
git
-
blame: Make the outp
u
t human reada
b
le
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-02
Fredrik Kuivinen
git-blame, t
a
ke 2
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-21
Fredri
k
Kuivinen
Add git-blame, a tool for
a
ssignin
g
blame
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-14
Fredrik Kuivi
n
en
s/SHELL/S
H
ELL_PATH/
in Makefil
e
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-02
Fre
d
rik Kui
v
i
ne
n
merge-recursive: Speed up commit graph construction
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-02
Fredr
i
k
K
u
ivinen
m
e
r
ge-recursive: Make
use of provided bases
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
Fredrik Kuivinen
git-branch: Do
c
umen
t
ation fixes
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
Fredr
i
k
Kuivine
n
merge-rec
u
rsive: Improve the e
r
r
o
r message
p
rinted
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fredr
i
k Kuivinen
gi
t
-w
h
at
c
hanged: Add
usage strin
g
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fredrik Ku
i
v
i
n
en
git-
l
o
g
:
Add usage string
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fredrik Kuivinen
git-diff: Usage
s
t
ring clean-up
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-14
Fredr
i
k Kuivinen
Usa
g
e message clea
n
-
up, tak
e
#2
commit
|
commitdiff
|
tree
2005-12-03
Fred
r
i
k
K
uivinen
New tes
t
c
ase: Criss-c
r
oss merge
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik
K
uivinen
New t
e
st case:
merge with directory/f
i
le conflicts
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredri
k
Kuivinen
test-lib
.
sh
:
Add new function, test_expe
c
t_code
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik K
u
ivi
n
en
git-
m
e
rge: Exit with c
o
de 2 if no str
a
tegy w
a
s abl
e
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-20
F
redrik
K
uivinen
merge-recur
s
i
ve: Replace 'except:'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik Kuivine
n
merg
e
-recursive: Use
'
~
' instead of '_' to separate
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik Kuivinen
me
r
ge-recurs
i
ve: Add copyr
i
gh
t
notice
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fr
e
drik Kuivin
e
n
mer
g
e-
r
ecursive: Indent t
h
e
ou
t
p
u
t properly
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fredrik Kuivi
n
e
n
merge-rec
u
rsive: Fix suppo
r
t
for br
a
nch n
a
mes con
t
aining
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fredrik Kui
v
inen
merge-recursive: Fix limited o
u
tput of rename
messag
e
s
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-08
Fr
e
drik Kuivinen
merge-recursive:
Only print
r
elevant rename mes
s
ages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-03
F
redrik Kui
v
inen
[P
A
TCH] Enable and
f
i
x
su
p
port for base less
m
erges
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik
Kuivinen
[PATCH] Teac
h
git-ls-files about '--' to d
e
note end
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik Kuivinen
[PAT
C
H]
T
ea
c
h
t
he re
c
ur
s
iv
e
merge stra
t
egy about r
e
names
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik Ku
i
vinen
[PAT
C
H] Mor
e
descriptive messa
g
e
s
for conflic
t
cases
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fre
d
rik
K
uivinen
[P
A
TCH] recursive-merge: Don't prin
t
a stack
t
race
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuiv
i
n
en
[PATCH] Use the 'die' function wh
e
r
e it is approp
r
iate
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivine
n
[PATCH]
U
s
e a temporar
y
index
fi
l
e
when we
m
erge th
e
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik
Kuivine
n
[PATCH] Adjus
t
git-merge-recursi
v
e
.
p
y
for the new tool
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[PAT
C
H] D
o
n't
o
u
tput 'Automatic merge failed,
.
.
.
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fre
d
rik
K
uivinen
[PATCH]
Be m
o
re
l
i
ke
the 'resolve' strateg
y
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivine
n
[
PATCH] R
e
name the
'fred
r
ik' me
r
g
e
s
trat
e
gy t
o
'rec
u
rs
i
ve'
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[PATC
H
] Make the Pr
o
gramError class pr
i
ntable
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik K
u
ivin
e
n
[PATCH
]
Make su
r
e we die if we don't ge
t
enough arguments
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fr
e
drik Kuivinen
[PATCH
]
In
t
roduce a 'di
e
'
fu
n
ction
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[PATCH] E
x
it with status code 2 i
f
we get an exc
e
ption
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[
P
ATCH]
F
ix as
s
e
rti
o
n f
a
i
l
ure when m
e
rgi
n
g
com
m
on
a
n
cestors
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-04
Fr
e
drik
Kuivine
n
[
PATCH
]
Make git-a
p
pl
y
unde
r
stand incompl
e
te lines
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree