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
parse_date(): fix parsing 03/10/2006
2006-02-14
Fredrik
K
uiv
i
nen
s/SHE
L
L/SHE
L
L_PATH/ in Makefile
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-02
Fredrik K
u
ivinen
merg
e
-recurs
i
ve:
Speed up commit graph constructio
n
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-02
Fredrik K
u
i
v
i
n
en
merge-recu
r
siv
e
: Make u
s
e
of provided
bases
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
Fredri
k
Kuivinen
git-branch: Doc
u
menta
t
ion fi
x
es
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
Fredrik Ku
i
vi
n
en
merge
-
recursive:
Improve the
e
rror m
e
ssage pri
n
t
ed
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fredrik
K
uiv
i
nen
git-wh
a
tchanged
:
A
d
d usage string
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fr
e
drik
Kuivine
n
git-log: Add usage strin
g
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fredrik Kui
v
in
e
n
g
it-diff: Us
a
ge string clean-up
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-14
F
r
e
drik Kuivinen
U
s
age message clean-up, take
#2
commit
|
commitdiff
|
tree
2005-12-03
F
r
edrik Kuivinen
Ne
w
test case: Criss-cros
s
merge
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik
Kui
v
inen
New test case: m
e
rge with di
r
e
c
t
o
ry/file
c
onflicts
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
F
redrik Kuivinen
test-lib
.
sh: Add new function, test_
e
xpect_code
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredri
k
Ku
i
vi
n
en
git-m
e
rg
e
:
Ex
i
t with
c
o
d
e 2 if
n
o
s
t
ra
t
e
g
y
w
as able
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-20
F
r
edrik Kuivine
n
merge-recursive:
R
e
p
lace 'e
x
cept:'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
F
r
e
drik Kuivinen
merge-recursive: Use
'
~' in
s
tead of '_' to separate
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fr
e
drik Kuivinen
merge-recursive: Add c
o
py
r
i
g
ht notice
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik
Kuivinen
mer
g
e-r
e
cursive: Ind
e
nt the output
p
rop
e
rly
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fred
r
ik
Ku
i
vinen
merge-recursiv
e
: Fix
support f
o
r branch names conta
i
ning
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
F
r
e
d
rik
Kuiv
i
nen
merge-rec
u
r
s
ive
:
Fix limit
e
d output of
r
ena
m
e
messag
e
s
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-08
Fredri
k
Kui
v
inen
merge-r
e
cur
s
iv
e
: Only print
relevant ren
a
m
e me
s
sages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-03
Fredri
k
K
uivinen
[PATCH] En
a
bl
e
an
d
f
ix supp
o
r
t
for base less mer
g
es
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik
Kuiv
i
nen
[PAT
C
H] Teach git-ls-files abo
u
t '--' to denote end
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fre
d
rik K
u
ivinen
[PATCH] T
e
a
ch the rec
u
rsive merge strat
e
gy a
b
out rename
s
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik Ku
i
vinen
[PATCH
]
More d
e
scriptive messages for co
n
flict cases
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik Kuivine
n
[PATCH] recursive-merge: Don'
t
print a stack trace
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fred
r
i
k Kuivinen
[PATCH]
U
s
e
the 'die
'
function where it is ap
p
r
o
p
riate
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[
P
ATCH] U
s
e a
temporar
y
i
n
dex
fil
e
when
w
e
m
erge th
e
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[PATCH] Adjust git-merge-recursive
.
p
y
for
t
he ne
w
tool
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuiv
i
nen
[PAT
C
H] Don't output 'A
u
tomatic merge failed,
.
.
.
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[
PATCH]
Be mo
r
e li
k
e
the 'r
e
solve' strateg
y
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik
K
uiv
i
ne
n
[PATCH] Rename the '
f
r
edr
i
k' merge stra
t
egy t
o
'r
e
c
u
r
si
v
e'
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
F
r
edrik
K
u
i
vinen
[PATCH
]
Make the
P
ro
g
r
amError clas
s
prin
t
able
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik
Kuivinen
[PATC
H
] Make su
r
e
w
e
die
if we do
n
't get en
o
ug
h
argu
m
ents
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
F
r
edrik Kuivinen
[PATCH] Intr
o
duce a
'di
e
'
functi
o
n
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuiv
i
nen
[PATCH] E
x
i
t wi
t
h sta
t
us
code 2 if we
g
et a
n
exception
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fred
r
ik
K
uivinen
[PATCH]
F
ix assertion
f
ailure when merging
c
ommon anc
e
stors
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-04
Fredrik Ku
i
vinen
[P
A
T
C
H] Ma
k
e git-appl
y
und
e
rstand incomplete
lines
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree