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
merge-recursive: Use '~' instead of '_' to separate file names from branch names
2005-11-12
F
redrik Kui
v
i
n
en
merge-recursive:
U
s
e '~' instead of '_' to separate
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik
K
u
ivi
n
e
n
m
erg
e
-re
c
ursive: Add copyright
n
otic
e
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik Kuivi
n
e
n
merge-recursi
v
e:
Indent
t
he output
properly
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-11-09
Fre
d
rik
K
uivin
e
n
m
erge-
r
ecu
r
sive: Fix
s
upport for bra
n
ch names con
t
a
ining
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-11-09
F
r
e
d
rik Kuivin
e
n
m
er
g
e-r
e
cursi
v
e: Fix
l
imited output
of r
e
n
ame messages
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-11-08
Fr
e
dr
i
k Kuivi
n
e
n
mer
g
e-recur
s
iv
e
: Only
p
rint relev
a
nt ren
a
me me
s
s
a
ges
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-10-03
Fredrik Kuivinen
[PATCH] En
a
ble and fix support for base less merges
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik Kuivinen
[
P
ATCH] Teach git-ls-files about '
-
-' to deno
t
e end
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-10-02
Fred
r
ik Kuivinen
[
P
A
TCH] Teach
the
recursi
v
e
m
erge
strategy ab
o
u
t
r
ename
s
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-25
F
r
edrik Kuivin
e
n
[PATCH] More descript
i
ve messages for conflict ca
s
es
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-25
F
redrik Kui
v
i
n
en
[P
A
TCH] recursi
v
e-merge: Don't
print a st
a
ck trac
e
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fredr
i
k Kuivinen
[PATCH]
Use the 'die' function
w
here
i
t
is
a
pp
r
op
r
iate
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
F
r
edrik Ku
i
vinen
[P
A
TCH] Use
a temp
o
rary i
n
dex file whe
n
we merge the
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
F
redri
k
Kuivinen
[PATC
H
] Adjust git-merge-r
e
c
u
r
sive
.
py for the new tool
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Ku
i
vinen
[PATC
H
] Don't outp
u
t 'Au
t
omatic
merge fai
l
ed,
.
.
.
'
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kui
v
inen
[PATCH] Be m
o
r
e
like the 'resolve
'
s
t
rategy
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
F
redrik
K
uiv
i
nen
[PATCH] Rename the 'fre
d
rik' m
e
rge
s
trategy
to 'recursive'
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik K
u
i
v
inen
[PATCH] Make
th
e
P
r
ogr
a
mError class printab
l
e
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik K
u
i
vinen
[PATCH] Ma
k
e sure we die if we d
o
n't
get
e
nough argume
n
ts
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
Fr
e
drik K
u
ivinen
[PATCH] Int
r
odu
c
e a
'die
'
func
t
ion
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivi
n
en
[PA
T
CH] E
x
it with status
c
od
e
2 if
w
e get an exception
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
Fred
r
ik Kuivinen
[PATCH] Fi
x
assertio
n
fa
i
lu
r
e when m
e
rging common ancestors
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-04
F
r
edrik Kuivinen
[PATCH] Make git-apply
unders
t
and in
c
omplete lines
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree