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
git-pull: do not barf on -a flag meant for git-fetch.
2005-10-03
Fredrik Kuivine
n
[PATCH] Enable and fix support f
o
r bas
e
les
s
merges
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredri
k
Kuivinen
[PATCH
]
Te
a
ch git-ls-files a
b
ou
t
'--' to denote end
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
F
redrik
K
uivinen
[PAT
C
H] Tea
c
h the recursive merg
e
stra
t
egy about rename
s
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik Kuivinen
[PATCH] More descriptive
messa
g
es for
conflict cases
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fr
e
d
r
ik Kuivinen
[
PATCH] recursive-me
r
ge: Don
'
t print
a stack
trace
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fred
r
ik Kuivi
n
en
[PATCH]
Use the
'
d
ie' function wher
e
it
is
a
p
p
ropriate
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivine
n
[PA
T
C
H] Use a tem
p
ora
r
y index file whe
n
we merge the
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivi
n
en
[PAT
C
H]
Adjust git-me
r
ge-recursive
.
py
for the n
e
w tool
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fre
d
r
ik Kuiv
i
nen
[PATCH] Don't output 'Automat
i
c mer
g
e f
a
iled,
.
.
.
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fred
r
ik Kuivinen
[
PA
T
CH] Be more like the 'res
o
lve' strategy
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fred
r
i
k
Kuivinen
[PAT
C
H] Rename the
'fredrik' m
e
rge
strat
e
gy to 'recursive'
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik
Kuivinen
[
PATCH] Make t
h
e
ProgramError c
l
ass printabl
e
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik
Kuivin
e
n
[PATCH] Make sure w
e
d
i
e
i
f we don't get en
o
ugh argumen
t
s
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
F
redrik Kuivinen
[PATCH] Introdu
c
e a 'die' function
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
F
r
e
dr
i
k Kuivinen
[P
A
TCH] Exit wi
t
h status cod
e
2 if we get
a
n
exception
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
F
redrik Kuivin
e
n
[PAT
C
H
]
Fix asser
t
ion fail
u
re when
m
erging common ancestors
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-04
Fredrik Kuivinen
[P
A
TCH] Make git-apply
under
s
t
an
d
incomplete lines
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree