repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Added support for git-p4 sync/rebase --with-origin. See git-p4.txt for details :)
2007-05-17
Simon Hau
s
man
n
A
dded su
p
po
r
t for git-p4 sync/rebase
-
-
with-origin
.
.
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-05-17
Si
m
on
Hausmann
Bite the bullet a
n
d
automa
t
ically c
o
nvert old s
t
yle
.
.
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-05-17
Simon
H
ausmann
Ch
a
n
g
e
d the default
p4 impo
r
t bra
n
ch t
o
be refs/remotes
.
.
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-05-17
Simon Hausman
n
Create the origin ba
s
e
d
i
m
por
t
branch using git update
.
.
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-05-17
Simon Hausma
n
n
Remov
e
d an
c
i
e
nt and unused code to find the las
t
imp
o
rted
.
.
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-05-17
S
i
mon Hausmann
Remov
e
d clea
n
tags co
m
m
and
.
It does
n
't ha
v
e any mea
n
i
ng
.
.
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-05-17
Si
m
on Hausmann
C
l
ean
up
co
d
e dupli
c
a
tion
f
or
r
e
vi
s
ion p
a
rs
i
ng and
.
.
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-05-17
Simon Hausmann
Alw
a
ys pass
a sha
1
for th
e
initi
a
l par
e
nt so t
h
at git
.
.
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-05-17
Simon
H
ausmann
Fixing syncing (gitdir discovery /
cd) for bare repositories
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-05-15
Simon H
a
usma
n
n
M
a
k
e git
-
p4
work with bare repositories
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-05-07
Simon Hausmann
Document some
i
mple
m
en
t
ation
d
e
t
ails,
for the curious
.
.
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-05-01
Simon Ha
u
sma
n
n
Cleanup, removed t
h
e old
ta
g
ging c
o
de
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-05-01
S
imon Hausmann
cleanup,
renamed
s
elf
.
globalPrefix to sel
f
.
depotPath
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-05-01
Sim
o
n H
a
usma
n
n
Micro cle
a
nup
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-05-01
Simon Hausmann
Doc clean
u
ps
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-04-15
Si
m
o
n Ha
u
smann
Hand
l
e patch err
o
rs in git-
p
4 subm
i
t
better
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-04-15
Simon Hausmann
A n
e
w
attempt at f
i
xing the
c
hild-fast-import-process
.
.
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-04-14
Sim
o
n H
a
usmann
Slightly i
m
p
roved
f
or
m
atting of the raw_in
p
ut
ques
t
i
ons
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-04-14
Si
m
on Hausmann
Rem
o
ved
t
he
o
ld patch apply
c
o
d
e from git
-
p4
s
ubmit
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-04-14
S
i
mon H
a
usma
n
n
Fix the
t
imezone formatting
.
No
w
qgit al
s
o
displays
.
.
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-04-13
Simon Hausmann
Print
a
n
error message of
s
o
m
e
sort
i
f g
i
t fast
-
impor
t
.
.
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-04-09
Simon Hausmann
Allow f
o
r
conv
e
nien
t
rebasing after git-p4
s
ubmit
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-04-08
Si
m
on Hausma
n
n
A
d
ded a
s
imple e
x
ample of
usage to t
h
e "documentation" :)
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-04-08
Simon Hausmann
fix var
i
able us
a
ge (o
o
p
s)
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-04-08
S
i
mon Hausmann
Fix file determination
for #hea
d
imports
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-04-08
Simon Hausmann
Add
e
d git-p4 clone conveni
e
n
c
e co
m
m
a
nd
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-04-08
S
i
m
o
n Hausmann
H
o
n
o
r --silent
f
o
r
labels
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-04-07
Simon Hausma
n
n
Tur
n
off
p
o
ten
t
ia
l
ly slow labe
l
detection by def
a
u
l
t
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-04-07
Simon Hausm
a
nn
P
rovide a tr
e
e summary a
f
ter
g
it-p4
r
eba
s
e
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-04-07
Simon Ha
u
smann
Added git-p4 r
e
b
a
se con
v
enience
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-03-25
S
i
mon Hausman
n
Don'
t
t
ry to p
a
rs
e
any
opti
o
n
s
with g
i
t-p
4
debug but
.
.
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-03-24
Sim
o
n Hausmann
Prefer
g
it
c
o
mmand over
g
it-command
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-03-24
Simon Hausmann
Minor cosmetic fixlet for the git-p4
submit sync question
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-03-24
Simo
n
H
ausma
n
n
Dif
f
erent v
e
r
s
ions of p4 have
differe
n
t
o
utput
f
or
.
.
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-03-22
Simon
H
ausmann
Br
a
nd new s
m
art inc
r
emental impo
r
t
that doesn't
need
.
.
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-03-22
Simo
n
Hausmann
Set the def
a
ul
t
branch in run, not in the c
o
nstructor
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-03-22
Si
m
on
Hausmann
H
e
lpe
r
fun
c
ti
o
n to
c
heck t
h
e exi
s
tanc
e
of a revisi
o
n
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-03-22
Simon Ha
u
smann
A
d
ded
s
ome helper fu
n
ction(s) to
parse th
e
depot path
.
.
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-03-22
Simon H
a
u
s
mann
Ch
a
nged th
e
def
a
ult b
r
anch for imports from
"
master
.
.
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-03-22
Simon Hausmann
Changed the fo
r
mat
of the impor
t
ed log message
s
li
g
htly
.
.
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-03-21
Si
m
on Hausmann
Don'
t
show the sub
m
i
t
t
emplate and
the
d
i
ff firs
t
i
n
.
.
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-03-21
Simon
H
ausmann
Docu
m
entation enhancements
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-03-14
Simon Hausmann
Auto-
d
e
tect t
h
e current git branch before submitt
i
n
g
.
.
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-03-14
Sim
o
n Hausm
a
nn
Ig
n
ore
A
pp
l
e
resourc
e
files w
h
en impo
r
ting f
r
o
m
perforce
.
.
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-03-10
S
imo
n
Hausmann
Make the
p
4 data/command
cache confi
g
urab
l
e through
.
.
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-03-10
Sim
o
n Ha
u
smann
Fi
x
e
d p4-debug
f
ile e
x
t
e
nsion
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-02-12
Simon H
a
usmann
When trying to map p4 integrati
o
n
s to g
i
t
mer
g
es j
u
st
.
.
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-02-12
Simon Haus
m
an
n
Set
gi
t
fast-import mark
s
for
eve
r
y impo
r
ted
change
.
.
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-02-12
Si
m
on Haus
m
ann
After marking a p4 branch as mer
g
ed don't ev
e
r merg
e
.
.
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-02-12
Simon Hausmann
M
o
re f
i
xes in
h
eur
i
st
i
c p4 bran
c
h
detection
based on
.
.
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-02-12
Simon Hausmann
Start
e
d work
o
n p4
b
r
a
nch detec
t
i
o
n (exp
e
rimenta
l
!
)
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-02-12
Simon Hausmann
Code cle
a
nups
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-02-11
Simon
Haus
m
ann
Cl
e
anups, remove unuse
d
variab
l
e
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-02-11
S
i
mon Hausmann
Create lightweig
h
t git tags (us
i
ng the
"reset" tri
c
k
.
.
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-02-10
Simon Hausmann
Ch
a
nged the defa
u
lt
git
i
mport branch from "p4" t
o
.
.
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-02-10
Simo
n
Hausmann
Avoid the excess
i
ve use of git
tags f
o
r
every perforce
.
.
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-02-10
Simon Hausmann
Minor code cleanups
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree
2007-02-08
Simon Haus
m
ann
Add
e
d a
l
ittle
helper script to debug the output of
.
.
.
Signed-off-by: Simon Hausmann <
simon@lst.de
>
commit
|
commitdiff
|
tree