llvm.org GIT mirror llvm / e36291a
Add reference to dcommit on GettingStarted Signed-off-by: Renato Golin <renato.golin@linaro.org> git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@171642 91177308-0d34-0410-b5e6-96231b3b80d8 Renato Golin 6 years ago
1 changed file(s) with 17 addition(s) and 2 deletion(s). Raw diff Collapse all Expand all
632632
633633 This leaves your working directories on their master branches, so you'll need to
634634 ``checkout`` each working branch individually and ``rebase`` it on top of its
635 parent branch. (Note: This script is intended for relative newbies to git. If
636 you have more experience, you can likely improve on it.)
635 parent branch.
636
637 To commit back changes via git-svn, use ``dcommit``:
638
639 .. code-block:: console
640
641 % git svn dcommit
642
643 Note that git-svn will create one SVN commit for each Git commit you have pending,
644 so squash and edit each commit before executing ``dcommit`` to make sure they all
645 conform to the coding standards and the developers' policy.
646
647 On success, ``dcommit`` will rebase against the HEAD of SVN, so to avoid conflict,
648 please make sure your current branch is up-to-date (via fetch/rebase) before
649 proceeding.
637650
638651 The git-svn metadata can get out of sync after you mess around with branches and
639652 ``dcommit``. When that happens, ``git svn dcommit`` stops working, complaining
643656
644657 % rm -rf .git/svn
645658 % git svn rebase -l
659
660 Please, refer to the Git-SVN manual (``man git-svn``) for more information.
646661
647662 Local LLVM Configuration
648663 ------------------------