RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-26 04:32:44 +01:00
Code Issues Projects Releases Wiki Activity

Add reference to dcommit on GettingStarted

Browse Source 
Signed-off-by: Renato Golin <renato.golin@linaro.org>
llvm-svn: 171642
This commit is contained in:
Renato Golin 2013-01-06 00:14:27 +00:00
parent b0628c5e77
commit 241f397a1d
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
docs/GettingStarted.rst
View File

@ -633,8 +633,21 @@ upstream git repo, run:
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
parent branch. (Note: This script is intended for relative newbies to git. If
you have more experience, you can likely improve on it.)
parent branch.
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
``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
% git svn rebase -l
Please, refer to the Git-SVN manual (``man git-svn``) for more information.
Local LLVM Configuration
------------------------