repo.or.cz
/
alt-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Use git-merge in git-pull (second try).
2005-09-25
Fredrik Ku
i
vi
n
e
n
[PATCH] More d
e
script
i
v
e messages for conflict cases
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik
Ku
i
v
inen
[
P
ATCH] recursive-merge: Don't
p
rint a
stack trace
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
r
edrik Ku
i
vinen
[PATCH]
U
s
e the
'
d
ie
'
function where it
i
s appropriate
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fre
d
rik Kuivinen
[
P
A
T
CH] Use a te
m
porary index
f
i
le when we merge the
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik
Kuivi
n
en
[PATC
H
]
A
dj
u
st git-mer
g
e-recur
s
i
v
e
.
py for the new too
l
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[
PATCH
]
Don't
o
utput
'
A
ut
o
m
a
t
ic merge f
a
il
e
d,
.
.
.
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fr
e
drik Ku
i
v
i
n
en
[PATCH
]
Be mo
r
e like the 'r
e
solve' strat
e
gy
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredri
k
K
u
ivinen
[PATCH] Rename the 'fredr
i
k' mer
g
e
strate
g
y to 'recursive'
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuiv
i
n
en
[PATCH]
M
ake the ProgramE
r
ror class print
a
ble
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivi
n
en
[
P
ATCH] Make sure we die if we don't ge
t
enough
a
r
gu
m
ents
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
F
r
e
d
rik Kuivinen
[PATCH] Introduce a 'die' f
u
nction
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredri
k
Kuivinen
[P
A
TC
H
] Exit with sta
t
us code 2 if we ge
t
an ex
c
eption
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik K
u
iv
i
nen
[PA
T
CH] Fix assertion
f
ailure when merging comm
o
n
a
ncesto
r
s
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-04
Fredr
i
k Kuivinen
[PATCH] Ma
k
e git-apply u
n
derstand in
c
omplete line
s
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree