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-tag: update usage string and documentation.
2005-10-03
Fr
e
drik
Kui
v
inen
[PAT
C
H] Enable a
n
d fix
s
uppo
r
t for b
a
se
less
m
erges
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredr
i
k
Kuivine
n
[PATCH]
T
each
g
it-ls
-
files about '--
'
t
o
denote en
d
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
F
r
edrik Ku
i
vinen
[P
A
TCH] Teach the recur
s
i
ve merge s
t
rateg
y
abou
t
ren
a
mes
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik
Kuivinen
[PATCH] More descripti
v
e
m
essa
g
e
s f
o
r confl
i
ct ca
s
e
s
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
F
r
edrik Ku
i
vinen
[
PATCH] r
e
cursive
-
merge: Don't
print a sta
c
k t
r
ace
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuiv
i
n
e
n
[PATCH]
U
se the 'die' function wh
e
r
e
i
t i
s
appropria
t
e
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[PATCH] Us
e
a tem
p
orary
i
nd
e
x fi
l
e when we merge th
e
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik
K
uivinen
[PA
T
CH]
A
d
j
ust git
-
merge-recursiv
e
.
p
y for the new tool
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik
Kuiv
i
nen
[
P
ATCH
]
D
o
n't output
'
Automatic
m
e
r
ge failed,
.
.
.
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivin
e
n
[PATCH] Be more
l
ike the
'
reso
l
ve' stra
t
egy
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fred
r
ik Kuivinen
[PAT
C
H] Renam
e
the 'fredrik' merg
e
strateg
y
to 'r
e
cu
r
siv
e
'
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik K
u
ivine
n
[PATC
H
] Ma
k
e t
h
e Pro
g
ramError class printabl
e
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fred
r
i
k Ku
i
vinen
[P
A
TCH]
Mak
e
sure we die if we d
o
n't get eno
u
gh arguments
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
F
redri
k
Kuivine
n
[
P
ATCH] Introd
u
ce
a 'die' f
u
nction
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[
P
ATCH] Exit
with status code 2
if we ge
t
an
e
xc
e
p
t
ion
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik
Kuivinen
[PATCH
]
Fix ass
e
rti
o
n
failure wh
e
n merging c
o
mmon ancestors
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-04
F
redrik K
u
ivinen
[PA
T
C
H
] Make git
-
apply und
e
r
stand i
n
complete li
n
e
s
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree