Changes between Version 5 and Version 6 of GitMigrationProposal

Timestamp:

03/15/09 06:00:16 (4 years ago)

Author:

cdavid

Comment:

Add revert scenario

GitMigrationProposal

@@ -97 +97 @@
 }}}
 
+You can add some aliases so that some git commands spell like the svn ones. The following are useful:
+
+{{{
+git config alias.co checkout
+git config alias.ci commit
+git config alias.st status
+}}}
+
+== Scenario 1 ==
+
+Getting the sources from the NumPy repository, just to look at the sources, or to build from last version instead of released:
+
+{{{
+git clone http://git.scipy.org/git/numpy numpy
+}}}
+
+A tarball will also be made available on the scipy website, so that you don't need git at all in this scenario.
+
+== Scenario 2 ==
+
+I have found a bug, and I want to submit a patch. I want to do it like in svn, I don't care about git:
+
+{{{
+# This will list the changed files
+git status
+# This will put the changes into a patch
+git diff
+}}}
+
+== Scenario 3: reverting changes ==
+
+I have made some changes, but I am confused, I just want to restart from last revision and throw everything away.
+
+There are several solutions - do NOT use revert, git revert is totally different from svn revert. The safe and easy one:
+
+{{{
+git stash
+}}}
+
+This will put your changes aside (in a 'stash'), and your working tree will be exactly as if you checked out from the last revision of your repository. It is safe because your changes are not lost - you can reapply them:
+
+{{{
+git stash apply
+}}}
+
+If you really don't care about the changes, and are ready to throw them away with no change of recovering: use the checkout option:
+
+{{{
+git co myfile
+}}}
+
+This will have the same semantics as svn revert.