summaryrefslogtreecommitdiff
path: root/docs/GettingStarted.rst
diff options
context:
space:
mode:
authorRenato Golin <rengolin@systemcall.org>2013-01-06 00:14:27 +0000
committerRenato Golin <rengolin@systemcall.org>2013-01-06 00:14:27 +0000
commite36291a1ef834e83089d52cd3129aa5dd666e3cb (patch)
tree5f457ae936a9eee826b7e428aede9dea71834a41 /docs/GettingStarted.rst
parente302b6cb69e96b948101e1ab6c0476187c92ee84 (diff)
downloadllvm-e36291a1ef834e83089d52cd3129aa5dd666e3cb.tar.gz
llvm-e36291a1ef834e83089d52cd3129aa5dd666e3cb.tar.bz2
llvm-e36291a1ef834e83089d52cd3129aa5dd666e3cb.tar.xz
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
Diffstat (limited to 'docs/GettingStarted.rst')
-rw-r--r--docs/GettingStarted.rst19
1 files changed, 17 insertions, 2 deletions
diff --git a/docs/GettingStarted.rst b/docs/GettingStarted.rst
index 3605686f16..443d21f04a 100644
--- a/docs/GettingStarted.rst
+++ b/docs/GettingStarted.rst
@@ -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
------------------------