diff options
author | Renato Golin <rengolin@systemcall.org> | 2013-01-06 00:14:27 +0000 |
---|---|---|
committer | Renato Golin <rengolin@systemcall.org> | 2013-01-06 00:14:27 +0000 |
commit | cd48362e62ba71b1597a07141e1ef1254dc419bd (patch) | |
tree | c45a030e93a981f0b2cdf8d4f2b8072124c6bbed | |
parent | 52d0fd8961ef4d03e042ac9eb1b30610518e3016 (diff) | |
download | llvm-cd48362e62ba71b1597a07141e1ef1254dc419bd.zip llvm-cd48362e62ba71b1597a07141e1ef1254dc419bd.tar.gz llvm-cd48362e62ba71b1597a07141e1ef1254dc419bd.tar.bz2 |
Add reference to dcommit on GettingStarted
Signed-off-by: Renato Golin <renato.golin@linaro.org>
llvm-svn: 171642
-rw-r--r-- | llvm/docs/GettingStarted.rst | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/llvm/docs/GettingStarted.rst b/llvm/docs/GettingStarted.rst index 3605686..443d21f 100644 --- a/llvm/docs/GettingStarted.rst +++ b/llvm/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 ------------------------ |