repo.or.cz
/
git
/
repo.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
merge-recursive: Indent the output properly
2005-11-12
Fredrik Kuiv
i
n
en
merge-rec
u
rsive: Inde
n
t
t
he output prope
r
ly
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fre
d
rik Kuivinen
merg
e
-
r
ecu
r
s
ive: Fix support for br
a
nch names containin
g
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
F
r
e
d
rik Kuivinen
merge-rec
u
r
s
i
v
e: Fix limi
t
ed outpu
t
o
f rena
m
e messages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-08
Fred
r
ik Kuivinen
m
e
rge-recurs
i
ve:
Only print relevant rena
m
e
m
essa
g
es
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-03
Fredrik
K
uivinen
[PAT
C
H] Enable and fix suppo
r
t for bas
e
less merges
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fre
d
ri
k
Kuivinen
[
PATCH]
T
e
ach git-ls-
f
iles abou
t
'--'
t
o denote end
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
F
redrik
K
u
ivinen
[PATCH] Teach the recursi
v
e me
r
ge strate
g
y ab
o
ut renam
e
s
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik Kuivinen
[PATCH
]
M
o
re descriptive messages f
o
r c
o
nf
l
ict cas
e
s
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
F
r
e
dri
k
Kuivinen
[PATCH
]
recur
s
ive-merg
e
: Don't print a sta
c
k
tra
c
e
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[PAT
C
H] Use the
'
die
'
func
t
ion
where it is appropriate
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fred
r
ik
Ku
i
vi
n
en
[PATCH]
Use a
t
empor
a
r
y index file when we merge
t
he
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredri
k
Kui
v
inen
[P
A
T
C
H] A
d
just git-merge-rec
u
r
sive
.
py for t
h
e new t
o
ol
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fre
d
r
i
k
K
u
i
vinen
[
PATCH] Don't output 'Automatic
merge failed,
.
.
.
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
redrik Kuivinen
[PATCH] Be more like the 'resolve' strategy
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik
Kuiv
i
ne
n
[PATCH] Re
n
ame the 'f
r
edrik' merge str
a
te
g
y to 'recursive'
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredri
k
Kui
v
i
n
en
[PAT
C
H] Make the Progr
a
mError class
p
rint
a
ble
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik
K
u
ivinen
[
P
ATCH] Make sure we d
i
e if we don
'
t
g
et enough
arguments
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik
K
uivinen
[PATCH] Introd
u
ce a 'die
'
func
t
ion
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fre
d
ri
k
Kui
v
inen
[PAT
C
H] Exit with status code 2 if
w
e
get
an exception
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivin
e
n
[PAT
C
H]
F
i
x
as
s
ertion failure w
h
en merging common anc
e
st
o
rs
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-04
F
r
edrik Kuivinen
[PA
T
CH]
M
a
ke git-apply unde
r
stan
d
incomplete lines
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree