Changes between Version 4 and Version 5 of GitStarted

Timestamp:

Nov 12, 2011, 9:49:37 AM (13 years ago)

Author:

nielx

Comment:

Add a nice article found by olta

GitStarted

@@ -1 +1 @@
 = Getting Started with Git (for Developers) =
 
-There are very many resources on the web where you can learn about Git. See the two resources below to get started. Furthermore, this page will discuss three concepts that you need to grasp in order to get started.
+There are very many resources on the web where you can learn about Git. See the two resources below to get started. Furthermore, this page will discuss three concepts that you need to grasp in order to get started. 
 
  * [http://git.or.cz/course/svn.html Git - SVN Crash Course]
@@ -25 +25 @@
 See the [http://gitready.com/beginner/2009/01/18/the-staging-area.html article on the staging area on gitready.com].
 
-== Editing history ==
+== Editing history: rebasing and more ==
 
 Unlike with SVN, with git you can edit the history of the repository. This means changing previous commits, changing the order of commits, removing previous commits and whatever more. See [http://www-cs-students.stanford.edu/~blynn/gitmagic/ch05.html this chapter from the Git Magic resource] to see how you can edit history.
 
-A special mention is for rebasing. See the [http://gitready.com/intermediate/2009/01/31/intro-to-rebase.html explanation to rebasing on gitready.com]. Learn about it: it is likely that you will use it!
+A special mention is for rebasing. See the [http://gitready.com/intermediate/2009/01/31/intro-to-rebase.html explanation to rebasing on gitready.com]. However, rebasing is a destructive operation that sometimes destroys a part of history that you might need. Read this [http://www.jarrodspillers.com/2009/08/19/git-merge-vs-git-rebase-avoiding-rebase-hell/ article on rebasing by Jarrod Spillers] that clears up when to rebase and when not. Learn about it: it is likely that you will use it! 
 
 {{{