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: Replace 'except:'
2005-11-20
Fredrik Kuivinen
merge-recursive: Replace 'except:'
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-11-12
Fredr
i
k Kuivine
n
merge-recursive:
Use '~' instead of
'
_' t
o
sepa
r
ate
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik Kuivinen
m
erge-recursiv
e
: Add
c
o
pyright n
o
tice
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik Kuivinen
merg
e
-
recursive: Indent the output p
r
operly
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-11-09
Fredr
i
k Ku
i
vinen
merg
e
-recursive: F
i
x su
p
port for
b
ranch
n
ames co
n
taining
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-11-09
Fredrik Kuivinen
me
r
ge-recursive
:
Fix limited output o
f
rename me
s
s
a
ges
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-11-08
Fredrik Kuivinen
merge
-
rec
u
rsive: Only pri
n
t relevant
r
e
n
ame messages
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-10-03
F
redrik
K
u
i
vinen
[PATCH]
Enable and fix support for base less
merges
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-10-02
Fre
d
ri
k
K
uivinen
[PATC
H
] Te
a
ch git-ls-files
a
b
out '--' to denote end
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-10-02
Fre
d
rik Kuiv
i
n
e
n
[
PATCH] Teac
h
t
he recursive merge st
r
ategy
a
bout renames
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik Kuivinen
[
P
ATC
H
]
M
ore descriptive messages f
o
r
c
on
f
lict
c
ases
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik Kuivinen
[PATCH]
r
ecursive-
m
erge: Don't
print a s
t
ack trace
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fredri
k
Ku
i
v
inen
[P
A
TCH] Use the 'die
'
func
t
ion
w
h
ere it i
s
appropriate
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik
K
uivine
n
[PATCH] U
s
e a temporary index file w
h
en
we
merg
e
the
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik
K
uivinen
[PA
T
CH]
Adjust git-merge-recu
r
sive
.
p
y
for the n
e
w tool
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
F
r
edrik Ku
i
vinen
[PATCH] Don't out
p
ut 'Automatic merge
f
a
i
l
ed,
.
.
.
'
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik
Kuivinen
[PAT
C
H] Be more like the
'
resolve' strategy
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kui
v
inen
[PATCH] Rename the 'fredri
k
' merge strate
g
y to 'rec
u
rs
i
ve'
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
Fredri
k
Kuivinen
[PATCH]
Make th
e
ProgramError class printable
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[
PATC
H
] M
a
ke sure we die if w
e
d
o
n't
get enough arguments
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
Fredr
i
k K
u
ivinen
[PATCH] Introduce
a 'die
'
func
t
ion
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kui
v
inen
[P
A
TC
H
] Exit
with status cod
e
2 if
w
e
get an exception
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
Fre
d
rik Kuivinen
[PATCH] Fix ass
e
rtion failure when merg
i
ng common ancestors
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-04
Fredrik Kuiv
i
nen
[PAT
C
H
] Ma
k
e git-apply
u
nderst
a
nd incomplete lines
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree