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/name' into next
2006-03-18
Fredrik Kuiv
i
nen
Mak
e
f
i
le
:
Ad
d
TAGS and
tags targets
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-17
F
r
e
drik Kuivinen
b
lame:
Fix g
i
t-bla
m
e
<di
r
ectory>
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-17
Fredrik
Kuivinen
blame: N
i
ce
r
output
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-11
Fredrik Kuiv
i
ne
n
blame: Re
n
ame d
e
tection (
t
ak
e
2)
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-11
Fred
r
ik Ku
i
vinen
rev-lib: Make it easy t
o
d
o rena
m
e
t
racking (take 2)
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-11
Fredrik Kuivinen
Make it poss
i
ble to not
c
lo
b
ber object
.
u
t
i
l in so
r
t
_
in_topol
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-09
Fredrik Kuivine
n
N
i
cer output from 'git'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-09
Fredrik Kuiv
i
n
en
Re
m
ove tr
a
iling dot after short description
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-09
Fr
e
dr
i
k Kuivinen
Fix
s
om
e
in
c
onsiste
n
ci
e
s in
t
he docs
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-06
Fredrik
K
u
i
vinen
git-
b
lam
e
: Use
the same te
s
ts for g
i
t-blame
as for
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-05
Fred
r
ik K
u
i
v
inen
git-blame: Make t
h
e o
u
tput human readable
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-02
Fredri
k
Kuivinen
g
i
t-blame,
t
ake 2
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-21
Fredr
i
k Kuivinen
A
dd
git-bl
a
me, a tool for assigning b
l
ame
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-14
F
r
edr
i
k Kuivinen
s/SHELL/SHELL_PATH/
i
n
Makefil
e
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-02
F
redrik Ku
i
vinen
merge-rec
u
r
siv
e
: Spe
e
d up co
m
mit graph construc
t
i
on
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-02
F
redrik Ku
i
vin
e
n
merge-recu
r
sive: Make use of provided ba
s
es
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
Fredrik Kuivin
e
n
git-
b
ranch: Documentation f
i
x
e
s
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
Fr
e
drik
Kuivinen
mer
g
e-
r
e
c
ursive: Improve the error m
e
ssag
e
printed
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fr
e
drik Kuivinen
git-whatchanged: Add usage str
i
n
g
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fredri
k
K
ui
v
ine
n
git-
l
og: A
d
d usage st
r
ing
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fredrik Ku
i
v
i
n
en
git
-
diff: Usage string clean-up
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-14
F
r
ed
r
ik Kuivinen
Usag
e
message
c
lean-up, take #2
commit
|
commitdiff
|
tree
2005-12-03
F
r
edrik K
u
ivinen
New te
s
t ca
s
e: C
r
is
s
-c
r
oss merge
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
F
redrik Kuivinen
New test case: merge wit
h
direc
t
ory/fil
e
conflicts
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Kuivinen
test-lib
.
sh: Add new function, t
e
st_expect_co
d
e
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Kuivinen
gi
t
-merge: Exit wit
h
c
ode 2 if no str
a
t
e
gy was a
b
le
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-20
Fredrik
Kuivinen
merge-recursive: Replace 'exc
e
pt:'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
F
redr
i
k Kuivinen
m
e
rge-recursive: Us
e
'
~
'
inst
e
a
d
of '_' to separate
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik
Kuivinen
merge-recursive: Add copyright notice
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fr
e
drik Kuivinen
merge
-
recursive: Indent the output properly
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fredrik
Kui
v
inen
mer
g
e-rec
u
rsive: Fix support f
o
r
b
ranc
h
names con
t
ain
i
ng
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fredrik K
u
i
v
inen
merge-re
c
u
r
sive: Fix limited o
u
tput of rename messa
g
e
s
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-08
Fr
e
drik
Kuivinen
me
r
ge-recu
r
sive:
O
n
l
y print
r
elevant
r
en
a
me message
s
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-03
F
r
e
d
rik Kuivin
e
n
[
P
ATCH] Enab
l
e and fix support for
b
ase less merges
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik
K
uiv
i
n
en
[PATCH
]
T
e
a
c
h
git-ls-file
s
about '--'
t
o
denote end
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fr
e
drik Kuivi
n
e
n
[
PATCH] Teach the rec
u
rsiv
e
merge
strateg
y
about renames
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredr
i
k Kuivi
n
e
n
[PATCH] Mor
e
d
e
s
c
riptive mess
a
ges f
o
r
conflict cases
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik
Kuivi
n
en
[PATCH] r
e
cursive-merge: Don'
t
print a
s
tack trace
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuiv
i
nen
[PATC
H
] Use the 'die' func
t
ion where it
is
a
ppropriate
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik K
u
ivinen
[PATCH
]
Use a
t
e
mporary index file
w
h
en
w
e
m
er
g
e the
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[PATCH
]
Adjust git-
m
erge-re
c
u
r
si
v
e
.
py fo
r
the ne
w
t
o
ol
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[P
A
TCH]
D
on
'
t output '
A
utomatic merge failed
,
.
.
.
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[PATC
H
] Be more like the 'resolve' strat
e
gy
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredr
i
k
Kuivine
n
[
P
ATCH] Rename th
e
'fredrik' merge st
r
ate
g
y
to 'r
e
cursive'
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fre
d
r
i
k Ku
i
vinen
[
P
ATCH] Make t
h
e Progr
a
mError clas
s
printable
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fred
r
ik Kuivinen
[
P
ATCH] Mak
e
sure we die if w
e
don't get enough a
r
gument
s
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[PA
T
C
H
] Introduce a 'die' f
u
nction
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik
K
uivinen
[PATCH] Exit w
i
th s
t
atu
s
code 2 if we ge
t
an exception
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fred
r
ik Kuiv
i
nen
[PATCH] Fix assertion fai
l
ure when merging
co
m
m
o
n
a
n
c
estors
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-04
Fredrik Kuivi
n
en
[PAT
C
H
]
Mak
e
gi
t
-apply
u
n
derstand in
c
o
mplete lines
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree