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-revert: Usage string clean-up
2005-12-14
f
reku0
4
5@student
.
.
.
git-revert: Usage s
t
ring clean-u
p
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-12-14
fr
e
ku045@stude
n
t
.
.
.
git-ve
r
if
y
-tag: Usage string clean-up, emit usage st
r
ing
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-12-14
f
r
eku0
4
5@student
.
.
.
Trivial usage string cle
a
n-u
p
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-12-14
Fredrik Kuivin
e
n
U
sage mes
s
age cl
e
an-up,
take #2
commit
|
commitdiff
|
tree
2005-12-03
Fr
e
dr
i
k Kui
v
in
e
n
New
test c
a
se: Criss-cross merge
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-12-03
Fre
d
r
i
k Kuivinen
N
e
w test case: m
e
rge
with
directory/file conflicts
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Ku
i
vi
n
en
test-l
i
b
.
sh: Add new funct
i
on, test_expect_cod
e
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Kuivinen
g
i
t-mer
g
e: Exi
t
with cod
e
2 if no strategy was able
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-11-20
Fredrik Kuivinen
merge-re
c
ursive: Replace 'ex
c
ept:'
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-11-12
Fr
e
drik K
u
ivinen
merge-recursive: U
s
e '~' instead of '_' to separate
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-11-12
Fre
d
ri
k
Kuivinen
mer
g
e-r
e
cursive
:
A
d
d
co
p
yrig
h
t notice
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-11-12
Fre
d
rik
Kui
v
i
nen
merge-recursive: Indent the output properly
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-11-09
Fr
e
drik Kuivin
e
n
merge-recursive: Fix support f
o
r branch
n
a
mes containing
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-11-09
Fredrik Kuivi
n
en
merge-recurs
i
ve: Fix lim
i
ted output
o
f
rename messages
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-11-08
Fredrik Ku
i
vinen
merge-recu
r
sive: Only print rel
e
v
a
n
t rename
messages
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-10-03
Fred
r
ik
Kuivinen
[PATCH] Enable
a
n
d fix supp
o
rt for bas
e
less mer
g
e
s
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-10-02
F
r
e
d
rik K
u
ivinen
[PATCH] Teach git-ls-files abo
u
t '--'
t
o
denote end
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-10-02
Fredri
k
K
uiv
i
n
e
n
[PATCH] Teach t
h
e recursive
merge s
t
r
a
t
e
gy about renames
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-25
Fre
d
rik K
u
ivi
n
en
[PATCH] More descript
i
ve mes
s
ages f
o
r con
f
lict cases
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-25
F
redri
k
Ku
i
vinen
[
PATCH] re
c
ursiv
e
-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 K
u
ivinen
[PA
T
C
H] Use the 'die'
f
unction where it is
a
p
propria
t
e
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fr
e
dri
k
Kuivin
e
n
[PATCH]
U
s
e a tempo
r
ary index
f
ile w
h
en we merge
t
he
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fred
r
ik Kuivinen
[PAT
C
H] Adjust git-m
e
rge-recurs
i
ve
.
p
y
f
o
r
t
he
n
ew
tool
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fred
r
ik Kuivinen
[PATCH] Don't output 'Au
t
omatic merge failed,
.
.
.
'
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
F
r
edrik Kuivinen
[PATCH] Be more like the '
r
e
solve'
s
trategy
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[PATCH] Rename the 'fred
r
ik'
m
erge strategy to 'recur
s
ive'
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
Fre
d
ri
k
Ku
i
vinen
[PATCH
]
M
ake th
e
ProgramError class prin
t
a
b
l
e
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
F
redrik Kui
v
inen
[P
A
TCH] Ma
k
e sure w
e
die
if we don't get enough arguments
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
Fredri
k
Ku
i
v
i
nen
[PATCH]
I
n
t
roduce a
'die' fu
n
ction
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik K
u
ivin
e
n
[PATCH] Exit with status c
o
de 2 if we get
a
n exception
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
Fred
r
ik
K
u
ivinen
[PATC
H
] Fix asser
t
ion failure when mer
g
ing common ancestors
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-04
Fredrik
K
u
i
vinen
[
P
ATCH] Make git-
a
pp
l
y understa
n
d
i
ncomplet
e
lines
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree