repo.or.cz
/
git
/
debian.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
git-diff: Usage string clean-up
2005-12-16
Fredr
i
k Kuiv
i
nen
git-diff: Usag
e
str
i
n
g
clean-up
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-14
Fredrik Kuivinen
Us
a
g
e message clean-up, take #2
commit
|
commitdiff
|
tree
2005-12-03
Fre
d
rik Kui
v
inen
New te
s
t
case: Criss-cross m
e
rge
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Kuivine
n
New t
e
st ca
s
e: merge with dire
c
to
r
y/file co
n
flicts
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik
K
uivi
n
e
n
test-lib
.
s
h
: Add new function,
test_
e
xpect_code
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik
K
u
i
v
inen
git-m
e
r
ge:
Exit wit
h
code
2
if n
o
strat
e
g
y wa
s
able
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-20
F
r
e
drik Kuivi
n
en
merge-recursive: Re
p
lace '
e
xcept:
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik Kuivinen
m
e
rge-recursive: Use '~' i
n
st
e
ad
o
f '_' to separ
a
t
e
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fr
e
drik Ku
i
vi
n
en
merge-r
e
c
u
rsive: Add co
p
yright
n
otice
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
F
re
d
rik Kuivi
n
en
me
r
ge-recur
s
ive: Indent the o
u
tput
p
r
operly
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fredrik
K
uivinen
merge-rec
u
rsive: Fix support
for branch names contain
i
ng
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fredrik Kuivinen
merge-recursive: Fix
li
m
i
ted
o
u
tput of rename
m
essages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-08
Fredrik
K
u
ivinen
me
r
ge-rec
u
rsive: On
l
y print
r
e
l
e
v
ant rename messa
g
e
s
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-03
Fredrik Kuivinen
[PA
T
CH
]
Ena
b
le and f
i
x
su
p
port
f
or
b
ase l
e
s
s
merges
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik Kuivinen
[PATCH] Teach g
i
t
-ls
-
files about '--' to denote end
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik Kui
v
i
n
en
[PATCH]
T
each th
e
r
e
cursive merg
e
strategy about renam
e
s
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
F
r
edrik K
u
ivinen
[PATCH] More desc
r
iptive messag
e
s for
c
o
nflict
case
s
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
F
r
edrik Kuivi
n
e
n
[PAT
C
H] recurs
i
v
e-merge: Don't print a stack trace
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredri
k
Kuivine
n
[PATCH]
U
se the 'die
'
function w
h
e
re it i
s
appropriate
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fre
d
rik
K
uivi
n
en
[PA
T
C
H
]
U
se a temporar
y
inde
x
file when
we merge the
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fr
e
drik Kuivinen
[PATCH] Adjust git-merge-recursive
.
py
f
or the
new too
l
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivin
e
n
[PATCH] D
o
n't out
p
ut
'Au
t
omatic merge failed,
.
.
.
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
r
edrik Kuivinen
[PATCH] B
e
more li
k
e the 'resolve' strategy
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Ku
i
v
i
nen
[
PATCH]
Rename the
'fredrik'
merge strategy
t
o 'recu
r
sive'
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[PATCH] Make the
P
rogr
a
mE
r
r
o
r class pri
n
table
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fred
r
ik Kuiv
i
n
e
n
[PATCH] Ma
k
e sure we d
i
e if we don't get enough argu
m
ents
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik
K
uivi
n
en
[PATCH] Introduce a 'die
'
function
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
F
redrik Kuiv
i
ne
n
[P
A
TCH] Ex
i
t with
s
tatu
s
cod
e
2 if
w
e get an exception
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[PATCH] Fix
assertion 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
Fredrik K
u
ivinen
[P
A
TCH]
Make
git-apply understand incompl
e
te lines
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree