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: Only print relevant rename messages
2005-11-08
Fredri
k
Kuivinen
merge-r
e
cursive: O
n
l
y
p
r
i
nt
r
elevant rename messages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-03
Fre
d
rik Kuivi
n
en
[PAT
C
H
]
Enable and fix sup
p
ort
f
or base l
e
ss mer
g
es
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik Kuivin
e
n
[PATCH] Teach git-ls
-
f
i
les abo
u
t '--'
to denote end
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik Kuivinen
[
P
A
TCH
]
Teach
the recu
r
s
ive merge str
a
t
e
gy about renam
e
s
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik
Kuivinen
[PATCH] More d
e
scriptiv
e
messages f
o
r conflict cases
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
F
redrik Kuivinen
[PATCH] recursive-merge: Don
'
t pri
n
t a stack
trace
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
r
edr
i
k
K
uivinen
[PATCH]
U
se the 'die'
function where it
is appropriate
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fre
d
rik Kuivinen
[PATCH
]
U
se a tempora
r
y index file wh
e
n
w
e
merge th
e
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[
PATCH] Adjust g
i
t-
m
e
r
g
e-rec
u
rsive
.
py for the new tool
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik
K
uivinen
[
PATCH]
D
on't output
'
Auto
m
a
tic
merge fail
e
d,
.
.
.
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fre
d
rik Ku
i
vi
n
en
[PA
T
C
H
] Be more like the 'resol
v
e'
s
t
ra
t
egy
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik
K
u
i
v
in
e
n
[P
A
T
C
H] Rename the
'fredri
k
'
merge
strategy to 'recursive'
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik
K
uivine
n
[
PATCH] Make the ProgramErr
o
r class printa
b
le
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
F
r
e
drik Kuivinen
[PATCH] Make sure we die if we do
n
't get en
o
ugh argu
m
ents
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredr
i
k Kuivinen
[PATCH]
I
ntro
d
uce a
'
die' fun
c
tion
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fr
e
drik Kuivinen
[PATCH] Exit with st
a
tus
code 2 if
w
e
get an e
x
ception
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[PATCH] Fix as
s
ertion fai
l
u
re w
h
en merging common ancestors
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-04
Fre
d
rik Kuivinen
[PA
T
C
H
]
M
ake git-apply
understand incom
p
lete lines
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree