repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
merge-recursive: Fix limited output of rename messages
2005-11-09
Fredrik Kuiv
i
nen
merge-recursive: Fi
x
limited o
u
tput of rename messag
e
s
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-11-08
Fredrik
Kui
v
in
e
n
merge-recursiv
e
: O
n
ly
print rel
e
van
t
re
n
ame mess
a
ges
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-10-03
Fredrik K
u
ivinen
[PATCH] Enable an
d
fix sup
p
ort for base less merges
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik K
u
i
v
inen
[
PATC
H
]
Teach git
-
ls-files about '--'
to denote end
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-10-02
Fred
r
ik Kuiv
i
nen
[PATCH] Teach the recursive m
e
rge strat
e
g
y
a
b
out r
e
n
ames
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-25
Fre
d
ri
k
Ku
i
vinen
[PATCH] Mo
r
e
descriptive messages for conflict
c
ases
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik Kuivinen
[PA
T
CH] rec
u
rsive-m
e
rge:
Don't print a
s
tack trace
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivine
n
[PATCH]
U
s
e
the
'
di
e
'
fun
c
tion where it
is appropriate
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
F
redrik K
u
i
vi
n
en
[P
A
TCH
]
Use
a temporary index file
w
hen we merge the
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fredri
k
K
uiv
i
nen
[PATCH
]
Adjust git-m
e
rge-re
c
ursive
.
py
f
o
r
th
e
n
e
w
t
ool
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivine
n
[PATCH] D
o
n't ou
t
put 'A
u
tomatic merge
failed,
.
.
.
'
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fred
r
ik Kui
v
inen
[PATCH] Be more like
t
he 'resolve' strategy
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik K
u
i
vinen
[PATCH] Rename the
'
fr
e
dr
i
k' merge s
t
rategy
t
o
'recursive'
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik
K
uivinen
[PATCH] Make the
P
rogr
a
m
Error cl
a
ss printable
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kui
v
i
nen
[PATCH] Make sure we die if we don't g
e
t enough arguments
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivine
n
[P
A
TCH
]
Introduce a 'die' functio
n
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
Fr
e
d
r
ik Ku
i
vinen
[
PATCH] Exit with status c
o
de 2
if we get an exce
p
tion
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
Fr
e
drik K
u
iv
i
n
e
n
[PATCH] Fix a
s
sertio
n
fa
i
lur
e
when m
e
rging common ances
t
ors
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-04
F
redrik Kuivi
n
en
[PATCH] Make git-apply unde
r
s
tand
incomplete lines
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree