Fixed indentation.
authorOleksandr Gavenko <gavenkoa@gmail.com>
Mon, 18 Jun 2018 17:23:33 +0300
changeset 2251 841872ee6d85
parent 2250 c713fb5d5c31
child 2252 95d312f81861
Fixed indentation.
git.rst
--- a/git.rst	Wed May 09 13:39:35 2018 +0300
+++ b/git.rst	Mon Jun 18 17:23:33 2018 +0300
@@ -568,27 +568,34 @@
 
 Making SVN repo::
 
-    $ cd $HOME/tmp
-    $ svnadmin create svn-repo
-    $ svn co file://$HOME/tmp/svn-repo svn-devel
-    $ cd svn-devel
-    $ mkdir tags trunk branches
-    $ svn add *
+  $ cd $HOME/tmp
+  $ svnadmin create svn-repo
+  $ svn co file://$HOME/tmp/svn-repo svn-devel
+
+  $ cd svn-devel
+  $ mkdir tags trunk branches
+
+  $ svn add *
   A         branches
   A         tags
   A         trunk
-    $ cd trunk/
-    $ printf "all:\n  echo XXX\n" >Makefile
-    $ printf "int main() {return 0;}" >main.c
-    $ svn add *
-    $ cd ..
-    $ svn st
+
+  $ cd trunk/
+  $ printf "all:\n  echo XXX\n" >Makefile
+  $ printf "int main() {return 0;}" >main.c
+
+  $ svn add *
+
+  $ cd ..
+
+  $ svn st
   A      trunk
   A      trunk/main.c
   A      trunk/Makefile
   A      branches
   A      tags
-    $ svn ci -m init
+
+  $ svn ci -m init
   Adding         branches
   Adding         tags
   Adding         trunk
@@ -600,11 +607,12 @@
 
 Moving SVN changset to git repo::
 
-    $ cd $HOME/tmp
-    $ git svn init file://$HOME/tmp/svn git-repo
-    $ ls -a
+  $ cd $HOME/tmp
+  $ git svn init file://$HOME/tmp/svn git-repo
+  $ ls -a
   .  ..  .git
-    $ git svn fetch
+
+  $ git svn fetch
       A   trunk/main.c
       A   trunk/Makefile
   W: +empty_dir: branches
@@ -629,19 +637,19 @@
 
 Making changes in svn::
 
-    $ cd $HOME/tmp/svn-devel/trunk
-    $ echo ".PHONY: clean" >>Makefile
-    $ svn ci -m "Added clean to phony."
+  $ cd $HOME/tmp/svn-devel/trunk
+  $ echo ".PHONY: clean" >>Makefile
+  $ svn ci -m "Added clean to phony."
   Sending        trunk/Makefile
   Transmitting file data .
   Committed revision 6.
 
 Making committed in git::
 
-    $ cd $HOME/tmp/git-repo/trunk
-    $ echo ".PHONY: all" >>Makefile
-    $ echo "int foo(int x) {return x+x;}" >>main.c
-    $ git status
+  $ cd $HOME/tmp/git-repo/trunk
+  $ echo ".PHONY: all" >>Makefile
+  $ echo "int foo(int x) {return x+x;}" >>main.c
+  $ git status
   # On branch master
   # Changed but not updated:
   #   (use "git add <file>..." to update what will be committed)
@@ -656,8 +664,8 @@
 
 Getting changes from SVN to git::
 
-    $ git svn rebase
-      M   trunk/Makefile
+  $ git svn rebase
+    M   trunk/Makefile
   r6 = 8165e9bfb38e9df09a7313d19606ec227629b670 (git-svn)
   First, rewinding head to replay your work on top of it...
   Applying Bug fixed.
@@ -681,7 +689,7 @@
 
 and return all from git to SVN::
 
-    $ git svn dcommit
+  $ git svn dcommit
   Committing to file:///home/sasha/tmp/svn ...
       M   trunk/Makefile
       M   trunk/main.c
@@ -694,8 +702,8 @@
 
 See what going to SVN repo::
 
-    $ cd $HOME/tmp/svn-devel/trunk
-    $ svn diff -r BASE:HEAD
+  $ cd $HOME/tmp/svn-devel/trunk
+  $ svn diff -r BASE:HEAD
   Index: Makefile
   ===================================================================
   --- Makefile    (working copy)