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 'maint'
2006-05-04
Fredri
k
Kuivinen
blame
:
Fix path p
r
unin
g
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-18
Fredrik Ku
i
vinen
Ma
k
efile
:
A
d
d
T
AG
S
and t
a
gs targe
t
s
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-17
Fr
e
drik Kuivinen
b
l
a
me: Fix
gi
t
-
blame
<
di
r
ecto
r
y>
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-17
Fredr
i
k Ku
i
vinen
blame: Nice
r
output
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-11
F
r
e
d
rik Kuivinen
blame: Rena
m
e
d
e
t
ection (
t
a
ke 2)
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-11
Fredrik Ku
i
vinen
r
e
v-lib: Make it easy t
o
do
rename tracking (take 2)
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-11
Fredrik Kuivinen
Ma
k
e it possible
t
o
not clobber object
.
u
til
i
n s
o
rt_in_topol
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-09
Fredrik Kuivinen
N
ic
e
r output from
'
git'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-09
Fredr
i
k Kuiv
i
nen
Re
m
ove trail
i
n
g dot after short des
c
rip
t
ion
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-09
Fredrik Kuivinen
Fi
x
som
e
inconsistencies in
the docs
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-06
Fredrik Ku
i
vinen
g
i
t-b
l
a
me: Use the sa
m
e tests
for git-blame as for
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-05
F
r
edrik K
u
ivinen
gi
t
-blame:
M
ak
e
the o
u
tput hu
m
an readable
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-02
Fredrik Kuiv
i
nen
git-blam
e
,
take 2
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-21
F
redrik Kui
v
inen
Add git-bl
a
me, a tool for as
s
ignin
g
blame
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-14
Fredrik Kuivine
n
s/SHELL
/
S
H
E
L
L
_PATH/ in Make
f
i
l
e
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-02
F
r
e
d
rik Kui
v
i
n
en
merge-re
c
ursive:
Speed up commit g
r
a
p
h construction
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-02
Fredrik Kuiv
i
nen
merge-recursi
v
e: Make use
of pr
o
vid
e
d bases
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
Fred
r
i
k Kuivinen
git
-
bra
n
ch: Docum
e
ntatio
n
fixes
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
Fredrik Kui
v
inen
merge-rec
u
rsive: Impr
o
ve th
e
error m
e
ssa
g
e
p
rinted
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fredr
i
k Kuivinen
g
it-whatcha
n
ged:
Add u
s
a
ge string
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
F
r
edrik Kuivinen
git-log: A
d
d usage stri
n
g
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
F
r
edrik Kuivi
n
en
g
i
t-
d
iff: Us
a
g
e
string clean-up
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-14
Fredrik
Kuivinen
Usa
g
e message
cle
a
n-up, take #2
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Kuivinen
New t
e
st case
:
C
ris
s
-cross
merge
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Kui
v
inen
New test case: merge wi
t
h
d
i
rectory
/
file con
f
licts
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredri
k
Kuivin
e
n
t
est
-
lib
.
s
h: A
d
d new function,
test_expect_code
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Kuivinen
git-merge: Exit
wi
t
h code 2 if no
strategy was
ab
l
e
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-20
F
r
edrik Kui
v
in
e
n
merge-recu
r
siv
e
:
R
epl
a
c
e
'
exce
p
t:'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fred
r
i
k Ku
i
v
inen
merge-recursive: Us
e
'~' instead o
f
'_' to separate
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredr
i
k K
u
i
vinen
mer
g
e-recu
r
sive: A
d
d copyri
g
ht
n
o
tice
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredr
i
k Kuivinen
me
r
ge-rec
u
rsive: Inde
n
t
t
he output
p
r
operl
y
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
F
r
edrik Kuivinen
merge-recur
s
i
v
e
: Fi
x
su
p
por
t
for branc
h
n
ame
s
containing
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fred
r
ik Kuivi
n
en
merge-recursive: F
i
x limited output of
rename message
s
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-08
Fredrik Ku
i
vin
e
n
merge-
r
ecursi
v
e: Only print rele
v
ant rena
m
e
m
essages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-03
F
r
edrik Kui
v
in
e
n
[PATCH] Enable and fix support for base
l
e
s
s
m
erges
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik K
u
iv
i
ne
n
[
PATCH] Teach git-l
s
-fi
l
es
a
bou
t
'-
-
' to d
e
note
e
n
d
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fre
d
rik Kuivinen
[
PAT
C
H]
T
each the recursive merge str
a
tegy about renam
e
s
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
F
r
edrik Kuivin
e
n
[PATCH]
More descriptive messages for conflict cases
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
F
r
edrik Kuivine
n
[PA
T
CH] recurs
i
ve-
m
erge:
D
on't
p
rint
a
s
tack trace
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
redri
k
Kuivinen
[PATCH] Use the 'die' functio
n
where it
i
s approp
r
i
ate
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[PATCH] Use a t
e
mpora
r
y
index file when we merge the
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
redrik Kuivinen
[PATC
H
] Adjust g
i
t-merge-rec
u
rs
i
ve
.
py for the new tool
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuiv
i
nen
[PATCH] Don't output 'Automatic merge failed,
.
.
.
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
redrik Kuivinen
[PATCH
]
Be
m
o
re like the 'resolve
'
strategy
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kui
v
inen
[PATCH] R
e
name t
h
e
'
fredrik' merge stra
t
eg
y
to 'recursive'
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
F
r
edrik Kuivi
n
en
[PATCH] Make
t
h
e ProgramError c
l
a
s
s printa
b
le
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik
K
uivinen
[PATC
H
] Ma
k
e sure we die if we don't
g
et enough a
r
gu
m
ents
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
F
redrik Ku
i
vin
e
n
[
P
A
T
CH
]
Introduce a 'd
i
e' function
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
F
redrik Kuiv
i
n
e
n
[PATCH] Exit with status c
o
de
2 if
w
e get an e
x
ce
p
tion
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik K
u
ivin
e
n
[
P
ATCH] Fix a
s
s
e
rt
i
on failure when merging common
a
n
cestor
s
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-04
Fr
e
drik K
u
ivinen
[
PATCH] Make g
i
t-apply unde
r
stand inco
m
ple
t
e lines
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree