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
mailsplit: allow feeding mbox from standard input.
2005-10-03
Fredrik Kuivinen
[PATCH] Enable and fix support for base le
s
s merge
s
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik Kuivinen
[PA
T
CH] Tea
c
h git
-
ls
-
files about '--'
t
o denote
e
nd
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fr
e
drik Kuivi
n
en
[PATCH]
T
each the recursive
m
erge strat
e
gy about renames
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik Kui
v
in
e
n
[
P
A
T
CH] More
d
escriptive messag
e
s
f
or c
o
nflict
cases
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fred
r
ik
K
uivinen
[
PATCH
]
recu
r
sive-merg
e
: Don't print a
s
tack
tra
c
e
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
redrik
Kuivi
n
e
n
[PATCH] U
s
e the
'd
i
e'
f
unction where it is appropriate
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
r
edrik Ku
i
vi
n
en
[P
A
TCH] Use a
t
em
p
orary index file when we merge
t
h
e
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredri
k
Ku
i
vi
n
e
n
[PATCH] Adjus
t
gi
t
-merge-
r
ecursive
.
py for the new tool
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuiv
i
nen
[PAT
C
H] Don't o
u
tput 'Automa
t
ic merge failed,
.
.
.
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
redr
i
k Kuivinen
[PA
T
CH] Be more like t
h
e
'resolve' strategy
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivin
e
n
[
PATCH]
R
ename the 'fredri
k
'
merge strategy to 'recu
r
sive'
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik K
u
ivinen
[P
A
TCH] Make th
e
Prog
r
a
mError clas
s
printable
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik
Kuivin
e
n
[
PATCH] Mak
e
su
r
e we die if we don't ge
t
e
nough arguments
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuiv
i
nen
[PATC
H
] Introduce
a 'die'
function
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fred
r
i
k Kuivinen
[PATCH] Exit with statu
s
code 2 if we
get an exception
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fred
r
ik Kuivinen
[PATCH] Fix assertion fail
u
re
w
hen merging co
m
m
o
n
ancestors
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-04
Fredr
i
k Kuivine
n
[PATCH
]
Make git-apply un
d
erstand in
c
omplete l
i
nes
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree