repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
upload-pack: Do not choke on too many heads request.
2005-10-03
Fredrik Kuivinen
[
P
A
T
C
H
]
En
a
ble and f
i
x suppor
t
for base less
merges
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik Kuivinen
[P
A
TC
H
] Tea
c
h git-ls
-
files about '--'
t
o
denote end
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
F
r
edrik Kuivi
n
en
[P
A
TCH] Teach t
h
e recursive merge s
t
rat
e
gy ab
o
u
t
r
enames
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik Kui
v
inen
[PAT
C
H]
M
o
re
descriptive
messages for conf
l
ict case
s
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik
K
uivine
n
[PATCH] recur
s
iv
e
-me
r
ge: Don't print a
s
tack trace
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fr
e
drik Kuivin
e
n
[PATC
H
] U
s
e the 'die'
function where it is appr
o
priat
e
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
r
edrik
K
uivinen
[PATCH]
U
s
e
a
t
e
mpo
r
ary in
d
ex file when we
m
erge
the
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
re
d
rik
Kuivinen
[PAT
C
H
]
Adjust git-merge-recursive
.
py for the new
t
o
o
l
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik K
u
ivinen
[PATCH] Don't o
u
tput 'Aut
o
matic
m
erge failed,
.
.
.
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[PA
T
CH]
B
e more l
i
ke
t
h
e
'resolve
'
s
t
rategy
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik
Kuivinen
[P
A
T
C
H] Rename the '
f
red
r
ik' m
e
rge str
a
t
egy to 'recursive'
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik
Kuivinen
[PATCH] Make the
ProgramError cl
a
ss printable
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredr
i
k Kuivinen
[PATCH] Make sure we
die if we
d
on't get en
o
u
g
h a
r
gum
e
nts
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
F
r
e
d
rik Kuivi
n
en
[P
A
TCH
]
Introduce a 'die' func
t
ion
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[P
A
TCH] Exit with status code 2 if we g
e
t an exceptio
n
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fr
e
drik
K
u
ivinen
[PATCH] Fix
asserti
o
n
f
ailure when merging comm
o
n
a
n
c
estors
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-04
Fre
d
r
ik Kuivinen
[PATCH
]
Make
g
it-apply
un
d
erstand i
n
complete
l
ines
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree