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 branches 'bf/doc' and 'db/tartree'
2006-01-29
F
r
e
drik
K
uivinen
git-branch:
D
ocumenta
t
ion fixes
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
Fr
e
drik Ku
i
vi
n
en
mer
g
e-recursive: Improve the error message printed
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
F
r
edrik
K
uivinen
git-whatcha
n
ged: Add usage string
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fredrik K
u
iv
i
nen
git-log
:
Add usage string
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fr
e
drik K
u
iv
i
nen
g
i
t
-
diff: Usage string c
l
ean-up
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-14
Fr
e
drik Kuivinen
Usage message clean-up, take #2
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Kuivinen
New te
s
t case: Cri
s
s-cross mer
g
e
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fred
r
ik K
u
ivinen
New t
e
st ca
s
e
:
merge with
d
i
re
c
tory/file conf
l
i
c
ts
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fred
r
ik Kuivinen
test-li
b
.
sh:
Add ne
w
function, test_
e
xpect_
c
o
de
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fred
r
i
k
Kuiv
i
nen
gi
t
-merg
e
:
E
x
it with cod
e
2 if no
s
trat
e
gy was able
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-20
Fredrik Kuiv
i
nen
merge-recur
s
ive: Re
p
lace 'e
x
cept:
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik Kuivinen
merge-re
c
ursi
v
e: Use '~' inst
e
ad
of '_' to sepa
r
a
t
e
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fred
r
ik
K
ui
v
i
n
en
merge-rec
u
rs
i
ve: Add co
p
yright notice
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fre
d
rik
Kui
v
inen
m
e
r
ge-recursive: Indent th
e
output
p
ro
p
erly
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fr
e
drik Kuivi
n
en
m
e
r
g
e
-recursive: Fix support fo
r
branch names containing
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fr
e
d
rik K
u
ivinen
mer
g
e-
r
ecursi
v
e
:
Fix limit
e
d out
p
ut of renam
e
mess
a
ges
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-08
Fre
d
rik
Kuivin
e
n
me
r
ge-recursive:
O
nly
p
rint relevan
t
rename messag
e
s
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-03
F
r
edrik
Kuivinen
[
P
A
TCH] Ena
b
le
a
n
d
fix support for b
a
s
e
less merges
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
F
redrik Kuiv
i
nen
[PATCH]
T
each git-ls-fi
l
es about '--' to
d
en
o
te en
d
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik
Ku
i
vin
e
n
[PATCH] Teach the recursive mer
g
e
strategy about
r
enames
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik Ku
i
v
i
nen
[PATCH] Mo
r
e desc
r
ipti
v
e message
s
f
or
c
on
f
lict cas
e
s
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik Kuiv
i
nen
[PATCH] rec
u
rsive-merge: Don't
p
r
int a s
t
ack trace
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivi
n
en
[PATCH]
U
se
the 'die' function where it is appropriate
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivin
e
n
[P
A
TCH] Use a temporary index file
w
h
e
n we merge
t
h
e
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fre
d
rik
K
uivin
e
n
[PATCH] Ad
j
ust g
i
t-mer
g
e-recursi
v
e
.
py f
o
r
the new to
o
l
.
.
.
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
Fredrik Kuivinen
[
P
ATCH]
B
e
m
ore like
the 'reso
l
ve' strategy
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredri
k
Kuivine
n
[
P
ATCH]
R
ename
th
e
'fredrik'
m
e
rge strategy to 'r
e
cursive'
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik K
u
i
v
inen
[PA
T
CH] Make the Pr
o
gramError
c
l
ass
print
a
b
l
e
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
F
r
edrik Kuivine
n
[PATCH] Make su
r
e we die if we don't get eno
u
g
h a
r
g
umen
t
s
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik
K
ui
v
inen
[PATCH]
Introduce a 'die' f
u
nction
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fre
d
rik
Kuivinen
[PATCH]
Exit with status c
o
de 2
if we
g
et
an ex
c
ept
i
o
n
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[PATCH
]
F
i
x assertion failu
r
e when
me
r
g
ing common ancestors
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-04
Fredrik Kuiv
i
nen
[PAT
C
H] Ma
k
e git-apply understand in
c
omplete lines
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree