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
applypatch: no need to do non-portable [[ ... ]]
2005-12-14
Fr
e
drik
K
uivine
n
Usage message clean-up,
tak
e
#
2
commit
|
commitdiff
|
tree
2005-12-03
Fredrik
K
ui
v
inen
New
t
e
st case: Cri
s
s-cros
s
merge
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Kuivinen
New test case:
m
e
r
g
e with directory/file conflict
s
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
F
r
e
drik
Kuivinen
t
es
t
-lib
.
sh: Add new function,
test_expect_
c
ode
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Kuivinen
git-merge: Exit w
i
th
c
ode
2
if no strategy was abl
e
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-20
Fr
e
drik Kuivinen
merge-recursive: Replace
'ex
c
ept:'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fr
e
dr
i
k Kuivinen
merge
-
recu
r
s
ive: Use '
~
' ins
t
ead o
f
'_' t
o
separate
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik Ku
i
vinen
merge-rec
u
rsiv
e
: A
d
d copyright noti
c
e
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fr
e
dr
i
k Kuivinen
m
erge-recursiv
e
: Indent t
h
e output p
r
operly
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fre
d
ri
k
Kuivinen
m
e
rg
e
-recursive: Fix su
p
port
f
or branch names cont
a
i
n
ing
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fredrik
K
uivinen
merg
e
-recu
r
sive
:
F
i
x limit
e
d out
p
ut of rename
messages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-08
Fredrik Kuivinen
merge-recursive: Only pr
i
nt re
l
eva
n
t rename messages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-03
Fred
r
i
k
K
uivinen
[PATCH]
E
nable and fix supp
o
rt fo
r
b
as
e
less
m
erges
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
F
r
edrik Kuivinen
[PATCH] Teach git-ls
-
f
i
les a
b
out '--' to
denote end
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik Kuivi
n
en
[P
A
TCH] Teac
h
the
recur
s
ive merge strategy about renames
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
F
redrik Kuivinen
[P
A
TCH] More descriptive messages for conflict
cases
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik K
u
i
v
i
n
e
n
[
P
ATCH] recursive-merge:
D
on't prin
t
a
st
a
ck tra
c
e
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
re
d
rik K
u
i
v
inen
[
P
ATC
H
] U
s
e t
h
e 'di
e
' functio
n
wher
e
it is appropriate
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
r
e
drik K
u
ivinen
[PATCH] Use
a temporary index file when we merge
t
he
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik
Kuivinen
[P
A
TCH
]
Adjust git-merge-
r
ecursive
.
p
y for
the new
tool
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik K
u
ivinen
[PATCH] Don't outpu
t
'
Au
t
omatic me
r
g
e
failed
,
.
.
.
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik K
u
ivinen
[PA
T
CH
]
B
e m
o
r
e
like the
'resolve'
strategy
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Ku
i
vinen
[PA
T
C
H] Re
n
am
e
the 'fredrik' merge strat
e
gy to 're
c
u
r
sive'
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredr
i
k K
u
ivin
e
n
[PA
T
CH] Make the
P
rogramError class p
r
intable
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fre
d
rik
Kuivinen
[PATC
H
] Mak
e
sure we die if we don't
g
et enough arguments
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fred
r
i
k
Kuivinen
[PATCH] Introduce a 'die' function
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kui
v
i
nen
[PATCH] E
x
it wit
h
st
a
tus
code 2 if we get an excep
t
i
o
n
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fred
r
i
k
K
u
ivinen
[
PATCH]
F
ix asserti
o
n failure when merging common ancest
o
rs
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-04
Fred
r
ik Kuivinen
[PATCH] Make git-
a
pply
u
nderstand incomplete lines
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree