repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
[PATCH] Adjust git-merge-recursive.py for the new tool names.
2005-09-13
Fre
d
rik Kuiv
i
nen
[PATCH]
A
d
j
ust git-merge-
r
ecursive
.
py
f
or the new tool
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fr
e
dr
i
k Kuivi
n
en
[PA
T
CH] Don't
output 'Auto
m
atic me
r
ge failed,
.
.
.
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[PATCH]
B
e
more
like the
'reso
l
ve' strategy
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik
Kuivine
n
[
P
A
T
CH] R
e
name
the 'fre
d
rik' merge strategy to
'recursi
v
e'
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fred
r
ik Kuivin
e
n
[
P
ATCH] Make the Pro
g
ram
E
rror class print
a
ble
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
F
redr
i
k Kuivine
n
[PA
T
C
H] Make
s
ur
e
w
e die
i
f we don't get enou
g
h arguments
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fred
r
ik Kuivinen
[P
A
TC
H
] Int
r
oduce
a 'die' fun
c
t
ion
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
F
redrik K
u
ivinen
[PATC
H
]
Ex
i
t wit
h
statu
s
c
o
de 2 if we get an exception
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivi
n
en
[PATCH]
Fix as
s
ertion failure when merging
c
ommon ancest
o
rs
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-04
Fredri
k
K
u
i
vinen
[PATCH] Make git-apply understand incomplete lines
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree