repo.or.cz
/
alt-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
git-verify-tag: Usage string clean-up, emit usage string at incorrect invocation
2005-12-14
freku04
5
@stud
e
nt
.
.
.
git
-
verify-tag: Usage string clean-
u
p
,
e
mit usage string
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-12-14
fr
e
ku045@student
.
.
.
Trivial usage string clean-up
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-12-14
Fr
e
drik Kuivine
n
U
sag
e
message clea
n
-up, take #2
commit
|
commitdiff
|
tree
2005-12-03
Fredri
k
K
uivi
n
en
New test case: Cris
s
-
c
ross
merge
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik
Kuivinen
New t
e
st case:
m
erge wi
t
h direct
o
ry/file conflicts
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-12-03
F
r
e
d
r
i
k Kuivinen
test-lib
.
sh: Add n
e
w fu
n
ction, test_expect_c
o
de
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik
K
uivinen
git-merge
:
E
xit with c
o
de 2 if n
o
st
r
ategy was ab
l
e
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-11-20
Fredr
i
k
Kuivinen
merge-re
c
ursive: Repl
a
ce
'
e
xce
p
t:'
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik
K
u
i
vinen
merge-recursive: Use '~' i
n
stea
d
of
'_' to separate
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik Kuivinen
merge-recursive: Ad
d
copyright notice
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik Ku
i
vin
e
n
merge-recursiv
e
:
I
ndent the output properly
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-11-09
Fr
e
drik Kuivin
e
n
m
e
rge-r
e
cursive: Fix
s
upport
for
b
r
anch names containi
n
g
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-11-09
Fredr
i
k
K
u
i
v
i
ne
n
me
r
ge-recursiv
e
: Fix
limited ou
t
p
u
t of ren
a
me mes
s
ages
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-11-08
Fre
d
rik Kuivinen
mer
g
e-recursive: Only p
r
i
n
t
relev
a
n
t
rename me
s
s
a
g
es
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-10-03
Fredri
k
Kuivinen
[PATCH] Enable and fix support fo
r
base
l
ess merges
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik
Kuivinen
[PATCH]
T
each git-ls-files about '--' to de
n
o
te end
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-10-02
Fre
d
rik Kuivinen
[PA
T
CH] Teach
t
he recursive merge
s
trategy
about renames
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-25
Fr
e
d
rik Kui
v
inen
[PATCH] More desc
r
iptive mess
a
ge
s
f
or conflict cases
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-25
Fredr
i
k
K
u
i
vinen
[
PATC
H
]
recursive-merge: Don'
t
print a stack trace
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
F
r
edrik Kuivinen
[PA
T
C
H
] Use t
h
e 'd
i
e' functi
o
n where i
t
i
s
appropr
i
at
e
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivi
n
en
[PATCH] Use a temporary
in
d
ex file when
w
e
m
erge t
h
e
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivin
e
n
[
PATCH
]
Adjust git-me
r
ge-re
c
ursive
.
p
y for th
e
new to
o
l
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fr
e
drik Kui
v
i
nen
[P
A
T
C
H]
D
o
n't
o
u
tput 'Automatic merge failed,
.
.
.
'
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[
PATCH] Be more
l
ike the 'resolve'
strategy
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[PATC
H
]
R
ename the 'f
r
e
d
rik' merge strateg
y
to 'recursi
v
e'
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[PATCH]
Mak
e
t
he P
r
ogramError
c
lass pr
i
ntable
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kui
v
inen
[
PATCH] Ma
k
e sure w
e
die if we
don't g
e
t
enough argume
n
ts
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
F
r
edrik Kuivinen
[PATCH] Introduce
a
'die' fun
c
t
i
o
n
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivine
n
[PATCH] Exit with s
t
a
tus c
o
de 2 if we get an exception
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Ku
i
v
ine
n
[P
A
TCH] Fix assertion
f
ailure when m
e
r
ging
commo
n
an
c
esto
r
s
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-04
F
redr
i
k Kuiv
i
n
e
n
[
P
ATCH] Make git-apply underst
a
nd
i
ncomplete lines
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree