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
t3200: branch --help does not die anymore.
2005-12-14
Fr
e
drik Ku
i
vi
n
e
n
U
s
ag
e
message
c
l
ean-
u
p
,
take #2
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Ku
i
vinen
N
ew test case:
C
riss-cross merge
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fre
d
rik Kuivinen
New te
s
t
case: merge w
i
t
h
directory/file con
f
l
icts
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fre
d
rik Kuivinen
tes
t
-lib
.
sh: Add
new function,
te
s
t_expec
t
_co
d
e
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
F
redrik
Kuivinen
g
it-merge
:
Exit with
c
ode 2 if no str
a
t
e
gy was able
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-20
Fredrik Kuivinen
me
r
ge-recursive: Replace 'exc
e
pt:'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
F
r
edrik Ku
i
vinen
merge-recursive: Us
e
'~' instead of '_' to separate
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
F
r
edrik Kuivinen
m
e
r
g
e-recursive: A
d
d cop
y
righ
t
n
o
t
ice
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik
K
uivin
e
n
m
erge-recursive: Indent the outp
u
t properly
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fredr
i
k Kuivinen
mer
g
e-recursive: Fix s
u
ppo
r
t for branch n
a
mes c
o
ntaini
n
g
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fr
e
drik
K
u
ivinen
merge-recursi
v
e: F
i
x
limited output of r
e
name messages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-08
Fredrik Kuiv
i
nen
m
e
rge-recursi
v
e: On
l
y
p
r
int re
l
evant rename
messages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-03
Fredrik K
u
ivinen
[PATCH] Enable and
f
i
x support
for base less merges
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
F
redrik Kuivinen
[PATCH
]
Teac
h
git-ls-files a
b
out
'
--' to denote en
d
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik Kuivinen
[PAT
C
H
] Teach the
recurs
i
ve merge
s
trategy abou
t
r
e
names
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredri
k
K
u
i
v
inen
[PATCH] More descrip
t
ive messa
g
e
s for conflic
t
ca
s
es
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik Kuivi
n
en
[PATCH] recursive-merge:
D
on't print a stack
trace
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fr
e
d
rik K
u
iv
i
n
e
n
[PATCH
]
Use t
h
e
'
d
ie' function where it is appropriate
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fred
r
ik Kuivinen
[PATCH] Use a tempo
r
ary
i
ndex fil
e
when w
e
mer
g
e the
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fre
d
r
i
k Kuivinen
[PATCH] Adjust git-merg
e
-
r
ecursive
.
py
f
or
t
he new tool
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
redrik Kuivinen
[PATCH]
D
on't outpu
t
'Automati
c
merge
failed,
.
.
.
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
re
d
rik Kuivinen
[PATCH] Be more like the
'
r
e
s
o
l
v
e' strateg
y
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
redri
k
K
u
i
v
inen
[PATCH] Rename the '
f
redrik' merge strat
e
gy
t
o
'
recurs
i
ve'
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik
K
uivinen
[
P
ATCH] Make the
P
ro
g
ramError
c
lass prin
t
a
b
le
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fre
d
rik
Kuivinen
[PATCH] Make sure we die if we d
o
n't get enough ar
g
uments
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[
P
ATCH] Introduce a 'die' function
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[
PATCH
]
Ex
i
t wit
h
statu
s
code 2 if w
e
get
an exception
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[PATCH] F
i
x assertion failure when merging com
m
on ancestor
s
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-04
Fredrik Kuivine
n
[P
A
TCH] Mak
e
git-apply und
e
rstan
d
incomplete lines
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree