From: Junio C Hamano Date: Wed, 30 Oct 2013 19:10:34 +0000 (-0700) Subject: Merge branch 'sb/git-svn-docs-indent-with-ht' X-Git-Tag: v1.8.5-rc0~8 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/02882bc8344b851f7f371905678bb5c88b8eaea6?ds=inline;hp=--cc Merge branch 'sb/git-svn-docs-indent-with-ht' * sb/git-svn-docs-indent-with-ht: git-svn docs: Use tabs consistently within the ascii doc --- 02882bc8344b851f7f371905678bb5c88b8eaea6 diff --cc Documentation/git-svn.txt index 2a3847649d,e801f2cafb..dcad890616 --- a/Documentation/git-svn.txt +++ b/Documentation/git-svn.txt @@@ -830,10 -810,10 +830,10 @@@ Tracking and contributing to an entire # View all branches and tags you have cloned: git branch -r # Create a new branch in SVN - git svn branch waldo + git svn branch waldo # Reset your master to trunk (or any other branch, replacing 'trunk' # with the appropriate name): - git reset --hard remotes/trunk + git reset --hard svn/trunk # You may only dcommit to one branch/tag/trunk at a time. The usage # of dcommit/rebase/show-ignore should be the same as above. ------------------------------------------------------------------------