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
Fix depot-path determination for git-p4 submit
2007-06-07
S
imon
H
ausmann
Fix d
e
pot-
p
ath de
t
erm
i
nation for git
-
p4 submit
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-06-07
S
i
mon
H
aus
m
ann
Fix git-p4 subm
i
t
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-06-07
Simon Hausmann
F
i
x
git-p4 re
b
ase
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-06-07
S
i
mon Ha
u
smann
Hack to m
a
k
e the multi-br
a
nch import work again wi
t
h
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-06-07
Simon Hausmann
Don't attempt to s
e
t the in
i
tialParent on mult
i
-
b
ranch
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-06-07
Simon Hausmann
F
ix common path "c
a
lcu
l
atio
n
" fr
o
m logs of multiple
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-06-07
Simon
Hau
s
mann
Fix support
for "depot-path" in old
e
r g
i
t-p4
i
m
port
s
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-25
Simon Haus
m
ann
Shor
t
c
ut the case w
h
ere we
h
a
ve
n
o
origin branch
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-25
Si
m
o
n Haus
m
ann
Make --with-origi
n
the default for syn
c
i
n
g
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-25
Simon Hau
s
ma
n
n
Make --with-origin al
s
o work withou
t
o
rigin :)
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-23
Simon
Hausmann
F
ix mu
l
ti-bran
c
h import
with --silent
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-23
Simon H
a
us
m
ann
Fix p4 executio
n
in gi
t
-p4
r
ollbac
k
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-23
Simon Hausmann
Catch p4 errors in rol
l
back early enou
g
h (before deleting
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-23
Simon Hausmann
O
o
ps, fill the /list
/
c
orrect
w
ith
t
he p4 exi
t
cod
e
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-23
Simon H
a
usmann
Don't mak
e
len(p4
C
md("
p
4
c
h
ang
e
s
-m
1 //fo
o
/
.
.
.
"))
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-23
S
i
mon Hausmann
Make
rol
l
b
a
ck wor
k
with
l
o
cally imp
o
rted branches
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-23
S
i
m
on Hausma
n
n
Avoid
calling g
i
t symbo
l
ic
-
ref refs/hea
d
s/
p
4/
/
HEAD
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-22
Simon Ha
u
sm
a
nn
Use
r
efs/heads/* in
s
tea
d
of r
e
fs/heads/p4/*
f
o
r lo
c
al
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-22
Simon H
a
usmann
Added sup
p
ort f
o
r --max-changes=<count
>
to ease import
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-22
Simon H
a
usmann
Added
suppo
r
t for
import
i
ng multiple bra
n
c
h
e
s into
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-21
S
i
mon H
a
usma
n
n
Fixes for rol
l
back,
de
l
ete
branches that did not ex
i
st
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-21
Simon
H
a
u
smann
Fix
branch detection in multi-b
r
anch imports
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-21
S
i
m
on Haus
m
ann
A
dded a
r
oll
b
ack co
m
mand fo
r
debuggi
n
g
.
It
sets
back
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-21
Simon Hausmann
Make git-p4 submit -
-
direct safe
r
b
y
also creating
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-21
Simon Hausmann
Detect wit
h
git-p4 sub
m
it --direct when there are no
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-21
Simon Hausma
n
n
Fix gi
t
symbolic-re
f
warn
i
ng on initial clone
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-21
Simon Hausmann
Fi
x
error d
e
tection with
git-p4
submit when th
e
req
u
ested
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-20
Simon Hausmann
Impr
o
ved output f
o
r multi bra
n
c
h i
m
p
orts and noted
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-20
Si
m
o
n
Hausman
n
Specifying --detect-branches is now only
n
ee
d
ed for
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-19
Simon Hausmann
Removed unu
s
e
d
variable, m
o
re clean
u
ps
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-19
Simon Haus
m
ann
M
o
re
c
leanups and sp
e
edup
s
for labels and b
r
anc
h
es
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-19
S
i
m
on Ha
u
s
m
ann
Clean
u
p/spee
d
up th
e
branch<>
f
il
e
s
plit and
r
emoved
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-19
Simon Hausm
a
nn
More wor
k
on
the i
n
c
r
emen
t
a
l importi
n
g
of multiple
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-18
Simon
H
ausmann
Give bra
n
ch
e
s a nice
project
p
refi
x
and
d
o
n
't bail
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-18
Simon Hausmann
Started rewriting the
br
a
n
ch dete
c
tion, based on "p4
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-18
Simon Ha
u
s
m
an
n
Rem
o
v
e
d
u
nus
e
d
c
ac
h
e variables
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-18
Simon Hausmann
Fix branch s
e
tup after initial
c
lone
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-16
Simon Hausmann
A
lit
t
le todo note befo
r
e I forget
it :), base
d
on
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-16
Simon Hausmann
Fix calling git-p4
r
ebase from withi
n
a subdire
c
tory
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-16
Simon Hausmann
Gi
v
e a better hint if gi
t
-
p
4 submit fails
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-16
Simo
n
Hausma
n
n
Added the
po
s
sibility of sk
i
pping patches durin
g
git
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-15
Simon H
a
u
smann
Fi
x
git-p4 clone //depot/pr
o
ject (head i
m
p
o
rt)
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-15
Simon Hausmann
Converted to unix newlin
e
s
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-03-23
Simon Hausmann
Use the
new incremental import st
y
le by default
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-02-22
Simon Hausma
n
n
Don't print a plain
newline at the e
n
d of the
e
x
ecutio
n
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-02-10
Si
m
o
n
H
a
usm
a
nn
A
dde
d
a
l
ittle
helper script to remove unuse
d
tag
s
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-01-31
Simo
n
Hausman
n
Implemented
b
asic
support for converting the date of
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-01-31
Si
m
on Hausma
n
n
Slightly
i
mp
r
oved h
e
lp usage
o
u
tput an
d
made specifying
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-01-31
Simon
Ha
u
smann
Added
ba
s
ic support for
s
pecifying the depot path to
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-01-30
S
imon Hau
s
mann
Initial imp
o
r
t of a
p
yt
h
on script to import chan
g
es
e
ts
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree