mirror of
https://github.com/RPCS3/llvm-mirror.git
synced 2025-03-04 18:38:37 +00:00
Add reference to dcommit on GettingStarted
Signed-off-by: Renato Golin <renato.golin@linaro.org> llvm-svn: 171642
This commit is contained in:
parent
b0628c5e77
commit
241f397a1d
@ -633,8 +633,21 @@ upstream git repo, run:
|
|||||||
|
|
||||||
This leaves your working directories on their master branches, so you'll need to
|
This leaves your working directories on their master branches, so you'll need to
|
||||||
``checkout`` each working branch individually and ``rebase`` it on top of its
|
``checkout`` each working branch individually and ``rebase`` it on top of its
|
||||||
parent branch. (Note: This script is intended for relative newbies to git. If
|
parent branch.
|
||||||
you have more experience, you can likely improve on it.)
|
|
||||||
|
To commit back changes via git-svn, use ``dcommit``:
|
||||||
|
|
||||||
|
.. code-block:: console
|
||||||
|
|
||||||
|
% git svn dcommit
|
||||||
|
|
||||||
|
Note that git-svn will create one SVN commit for each Git commit you have pending,
|
||||||
|
so squash and edit each commit before executing ``dcommit`` to make sure they all
|
||||||
|
conform to the coding standards and the developers' policy.
|
||||||
|
|
||||||
|
On success, ``dcommit`` will rebase against the HEAD of SVN, so to avoid conflict,
|
||||||
|
please make sure your current branch is up-to-date (via fetch/rebase) before
|
||||||
|
proceeding.
|
||||||
|
|
||||||
The git-svn metadata can get out of sync after you mess around with branches and
|
The git-svn metadata can get out of sync after you mess around with branches and
|
||||||
``dcommit``. When that happens, ``git svn dcommit`` stops working, complaining
|
``dcommit``. When that happens, ``git svn dcommit`` stops working, complaining
|
||||||
@ -645,6 +658,8 @@ about files with uncommitted changes. The fix is to rebuild the metadata:
|
|||||||
% rm -rf .git/svn
|
% rm -rf .git/svn
|
||||||
% git svn rebase -l
|
% git svn rebase -l
|
||||||
|
|
||||||
|
Please, refer to the Git-SVN manual (``man git-svn``) for more information.
|
||||||
|
|
||||||
Local LLVM Configuration
|
Local LLVM Configuration
|
||||||
------------------------
|
------------------------
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user