repo.or.cz
/
git
/
git-svn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
merge-base: fully contaminate the well.
2005-11-09
Fredrik Kuivinen
merge-rec
u
r
sive
:
Fix su
p
port f
o
r
bran
c
h nam
e
s c
o
ntaining
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
F
r
edrik Kuivinen
merge-recurs
i
v
e: F
i
x limited output of rename messages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-08
Fredrik Kuivinen
m
e
rge-recursive: Only prin
t
relevant rename me
s
sages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-03
Fredrik Kuivinen
[PA
T
C
H
]
E
n
able
and
f
i
x
support for
b
a
se less me
r
ges
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
F
red
r
i
k Kuivi
n
en
[P
A
TCH]
Teach git-ls
-
files about '--' to denote end
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
F
redrik Kuivi
n
e
n
[PAT
C
H
]
Teach
t
he recursiv
e
merge strat
e
gy
a
bo
u
t
renam
e
s
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik
K
u
ivin
e
n
[PATCH]
M
ore desc
r
i
ptive m
e
ssages for conflict cases
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
F
r
edrik
K
uivinen
[PATCH] recursive-merge: Don
'
t print a stack trace
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fred
r
i
k
Kui
v
inen
[PATC
H
] Use the 'di
e
'
f
u
n
c
t
ion whe
r
e it is appropriate
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredri
k
Kuivinen
[PA
T
CH
]
Us
e
a temporary in
d
ex f
i
le when we me
r
g
e
the
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
redrik Kui
v
inen
[PA
T
CH] Ad
j
us
t
git-merge-recursive
.
py f
o
r
t
he new tool
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fred
r
ik
Kuivinen
[PATCH] D
o
n't output 'Automatic merg
e
f
ail
e
d,
.
.
.
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivin
e
n
[PATCH] Be more like
the 'resolve' strategy
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fred
r
ik
K
uiv
i
nen
[PA
T
C
H
] Rename the 'fredrik'
m
erge
stra
t
egy
t
o 'recursive'
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fr
e
drik Kuivine
n
[PATCH] Make the Progr
a
mError class printable
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
F
r
edrik Kuivinen
[PATCH
]
Make sure
w
e die
i
f we
d
on'
t
get enough arguments
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivine
n
[PATCH]
I
ntroduce a '
d
i
e
' functi
o
n
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik
K
uiv
i
n
e
n
[PATCH] Ex
i
t with stat
u
s code 2 if we
g
et an exception
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[
P
A
T
C
H] Fix assertion failure when merging common ancestor
s
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-04
Fredrik Kuivinen
[PATCH] Make git-apply understand
in
c
omplete line
s
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree