repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'jc/count'
2006-05-04
Fr
e
d
rik Kuivinen
blame: Fix path pruning
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-18
Fr
e
drik Kuivinen
Makef
i
le:
A
dd TAGS an
d
t
ags tar
g
et
s
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-17
Fre
d
rik Kuivinen
blame: Fix
g
it-blame <directory>
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-17
Fredrik Kuivinen
blame:
N
i
ce
r
outpu
t
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-11
Fr
e
drik Kuivinen
b
l
ame:
R
ename detection
(take 2)
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-11
Fredrik Kui
v
inen
rev-
l
ib: Make i
t
easy to d
o
rename tracking (take 2)
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-11
Fredrik
K
u
i
vin
e
n
M
a
ke
it possible to no
t
clobber object
.
util in sort_in_topol
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-09
Fr
e
d
r
ik Kuiv
i
ne
n
Ni
c
er output from 'git'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-09
Fred
r
ik Kuivinen
Remove traili
n
g d
o
t after short
d
esc
r
iption
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-09
Fre
d
rik
K
uivinen
F
ix s
o
m
e
i
n
consistencies in the d
o
cs
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-06
Fredri
k
Kuivin
e
n
git-bl
a
me: Use the same
t
ests
f
or git-bla
m
e as
f
or
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-05
Fredrik Kuivinen
git-
b
lame: Make the output
h
uman readable
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-02
Fredrik Kuivinen
git-bl
a
m
e
,
take 2
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-21
F
r
e
d
rik Kuivinen
Add git-
b
l
a
me, a tool for a
s
si
g
ning
blame
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-14
Fredri
k
Kui
v
inen
s/S
H
E
LL/S
H
E
L
L
_PATH/
in Makefile
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-02
Fr
e
d
r
ik Kuivinen
merge-recursive
:
S
pe
e
d up commit
graph
c
onstruction
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-02
Fredrik
Kuiv
i
n
e
n
merge-re
c
ursive
:
Make use of provided bases
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
Fredrik Kui
v
in
e
n
git-b
r
anch: Documentation fixes
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
Fr
e
drik Kuivin
e
n
merge-recurs
i
ve: Improve
th
e
error mes
s
age printe
d
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
F
r
edrik
K
uivinen
git-whatchang
e
d
:
A
d
d
u
s
a
g
e
str
i
ng
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fredrik Kuiv
i
nen
git-log: Add usage s
t
r
ing
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fredrik Kui
v
inen
gi
t
-diff
:
Usa
g
e
string
clean-up
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-14
Fredrik K
u
ivinen
Usage message clean-u
p
, t
a
k
e
#2
commit
|
commitdiff
|
tree
2005-12-03
Fredrik
K
uivi
n
en
New test case: Cri
s
s-cross m
e
r
ge
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
F
redrik Kuivinen
New t
e
st cas
e
: merg
e
with directory/fi
l
e
c
onflict
s
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
F
redrik Kuivi
n
en
test
-
lib
.
sh: Ad
d
new fu
n
ct
i
on, test_ex
p
ect_code
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Kuiv
i
ne
n
git-merge: Exit with
code 2 if
no strategy was
a
ble
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-20
F
redrik Kuiv
i
nen
merge
-
r
ec
u
rsiv
e
: Replace
'
except:'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik Kuivinen
merge-r
e
cu
r
s
i
ve: Us
e
'~' inst
e
ad
o
f '_' to separate
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik Kui
v
i
n
e
n
merg
e
-recursive: Add
c
o
p
yr
i
g
h
t notice
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fre
d
ri
k
Kuivi
n
en
merge-re
c
ursive
:
I
n
den
t
the output
p
rope
r
ly
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fredrik
Kuivinen
m
erge-recursive: Fi
x
sup
p
ort for branch names con
t
ainin
g
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fredrik Kuivi
n
en
merge-recursive:
F
ix
li
m
i
ted output
of r
e
n
a
me
m
ess
a
ge
s
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-08
Fredrik Kuivinen
merge-recursive: Only print rele
v
a
n
t renam
e
m
e
s
sages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-03
Fred
r
ik
K
ui
v
inen
[PAT
C
H]
E
nable and
f
ix support for ba
s
e less merges
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik Ku
i
vinen
[PATCH] Tea
c
h git-ls
-
files ab
o
ut '--'
t
o den
o
te end
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik K
u
i
vinen
[PAT
C
H]
Teach the
r
e
c
u
rsive merg
e
strategy about
r
enames
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredr
i
k
Kuivinen
[
PATC
H
] More descri
p
t
ive mes
s
ages for conflict ca
s
es
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik Kuivinen
[PATCH] recursive-me
r
ge: Don't prin
t
a st
a
ck t
r
ac
e
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
r
edrik Kuivinen
[PATCH]
U
se
the
'
d
ie' fu
n
ction where it is appr
o
priate
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fre
d
r
i
k
K
uivinen
[P
A
TCH] Use a temporary ind
e
x 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
g
i
t-merge-recur
s
i
v
e
.
py
f
or the
new tool
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fr
e
drik Kuivinen
[PATCH] D
o
n't ou
t
put 'Automa
t
ic merge failed,
.
.
.
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[PATCH] Be mor
e
l
ike the 'resolve' strat
e
g
y
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik K
u
ivinen
[PATCH] Re
n
ame the 'fredr
i
k' merge strat
e
gy
to 'recursi
v
e'
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[PATCH]
M
a
ke
the Pro
g
ramError class printable
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
F
re
d
rik Kuivinen
[PATCH] Make
s
ure we d
i
e if we
d
o
n't g
e
t enough arguments
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik
K
uivinen
[PATCH] Introduce a
'
d
ie' function
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
F
r
edrik
K
uivinen
[PATCH] Exit
with status c
o
d
e
2 if we get an exception
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[PATCH] Fix
a
ssertion failure when merging common a
n
c
estors
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-04
Fr
e
dr
i
k Kuivinen
[
PATCH] Mak
e
git-ap
p
l
y
un
d
e
rstand incomplete lines
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree