summaryrefslogtreecommitdiff
path: root/contrib/fast-import/git-p4.txt
AgeCommit message (Collapse)AuthorFilesLines
2011-05-13git-p4: warn if git authorship won't be retainedLibravatar Luke Diamand1-0/+7
If the git commits you are submitting contain changes made by other people, the authorship will not be retained. Change git-p4 to warn of this and to note that --preserve-user can be used to solve the problem (if you have suitable permissions). The warning can be disabled. Add a test case and update documentation. Signed-off-by: Luke Diamand <luke@diamand.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-04-26git-p4: add option to preserve user namesLibravatar Luke Diamand1-0/+29
Patches from git passed into p4 end up with the committer being identified as the person who ran git-p4. With "submit --preserve-user", git-p4 modifies the p4 changelist (after it has been submitted), setting the p4 author field. The submitter is required to have sufficient p4 permissions or git-p4 refuses to proceed. If the git author is not known to p4, the submit will be abandoned unless git-p4.allowMissingP4Users is true. Signed-off-by: Luke Diamand <luke@diamand.org> Acked-by: Pete Wyckoff <pw@padd.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-02-14Obey p4 views when using client specLibravatar Ian Wienand1-0/+5
When using the p4 client spec, this attempts to obey the client's output preferences. For example, a view like //depot/foo/branch/... //client/branch/foo/... //depot/bar/branch/... //client/branch/bar/... will result in a directory layout in the git tree of branch/ branch/foo branch/bar p4 can do various other reordering that this change doesn't support, but we should detect it and at least fail nicely. Signed-off-by: Ian Wienand <ianw@vmware.com> Acked-by: Pete Wyckoff <pw@padd.com> Acked-by: Tor Arvid Lund <torarvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-08-24Clean up the git-p4 documentationLibravatar Simon Hausmann1-31/+38
This patch massages the documentation a bit for improved readability and cleans it up from outdated options/commands. Signed-off-by: Simon Hausmann <simon@lst.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-08-11Put in the two other configuration elements found in the sourceLibravatar Anand Kumria1-0/+8
I am not entirely clear what these parameters do but felt it useful to call them out in the documentation. Signed-off-by: Anand Kumria <wildfire@progsoc.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-08-11Put some documentation in about the parameters that have been addedLibravatar Anand Kumria1-0/+32
Signed-off-by: Anand Kumria <wildfire@progsoc.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-08-11Move git-p4.syncFromOrigin into a configuration parameters sectionLibravatar Anand Kumria1-12/+16
Signed-off-by: Anand Kumria <wildfire@progsoc.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2007-06-11Mention remotes/p4/master also in the documentation.Libravatar Simon Hausmann1-3/+3
Signed-off-by: Simon Hausmann <simon@lst.de>
2007-05-25Make --with-origin the default for syncing.Libravatar Simon Hausmann1-11/+3
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
2007-05-23Doc updatesLibravatar Simon Hausmann1-1/+8
Signed-off-by: Simon Hausmann <simon@lst.de>
2007-05-17Added support for git-p4 sync/rebase --with-origin. See git-p4.txt for ↵Libravatar Simon Hausmann1-0/+20
details :) Signed-off-by: Simon Hausmann <simon@lst.de>
2007-05-17Changed the default p4 import branch to be refs/remotes/p4/{HEAD,master}Libravatar Simon Hausmann1-3/+3
instead of refs/heads/p4. Signed-off-by: Simon Hausmann <simon@lst.de>
2007-05-07Document some implementation details, for the curious... :)Libravatar Simon Hausmann1-0/+17
Signed-off-by: Simon Hausmann <simon@lst.de>
2007-05-01Doc cleanups.Libravatar Simon Hausmann1-6/+2
Signed-off-by: Simon Hausmann <simon@lst.de>
2007-04-08Added a simple example of usage to the "documentation" :)Libravatar Simon Hausmann1-0/+22
Signed-off-by: Simon Hausmann <simon@lst.de>
2007-04-08Added git-p4 clone convenience commandLibravatar Simon Hausmann1-1/+22
Signed-off-by: Simon Hausmann <simon@lst.de>
2007-04-07Added git-p4 rebase convenienceLibravatar Simon Hausmann1-1/+13
Signed-off-by: Simon Hausmann <simon@lst.de>
2007-03-29Fix the docs for git-p4 submit and turn git-p4 submit --master=foo intoLibravatar Simon Hausmann1-14/+9
simply git-p4 submit mytopicbranch. Signed-off-by: Simon Hausmann <hausmann@kde.org>
2007-03-23Make it possible to run git-p4 submit from within the git repositoryLibravatar Simon Hausmann1-14/+13
Signed-off-by: Simon Hausmann <hausmann@kde.org>
2007-03-22Brand new smart incremental import that doesn't need tags or git repo-config :)Libravatar Simon Hausmann1-4/+2
Signed-off-by: Simon Hausmann <simon@lst.de>
2007-03-22Changed the default branch for imports from "master" to "p4"Libravatar Simon Hausmann1-3/+3
Signed-off-by: Simon Hausmann <simon@lst.de>
2007-03-22Removed the .py extension from git-p4 as it's annoying to type every time.Libravatar Simon Hausmann1-7/+7
Signed-off-by: Simon Hausmann <hausmann@kde.org>
2007-03-21Documentation enhancements.Libravatar Simon Hausmann1-0/+6
Signed-off-by: Simon Hausmann <simon@lst.de>
2007-03-20Start of the git-p4 documentation.Libravatar Simon Hausmann1-0/+74
Signed-off-by: Simon Hausmann <hausmann@kde.org>
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-26 17:20:05 +0000