Changes between Version 13 and Version 14 of UsingGit

Timestamp:

12/09/10 21:23:15 (15 years ago)

Author:

Janne Grunau

Comment:

--

UsingGit

@@ -58 +58 @@
 || svn commit || git commit / git push || in git, git commit commits locally, git push pushes to the upstream repo.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   Additionally, changes must be staged before committing. ||
 || ---- || git add -i / git add -p || stage commits ||
-|| svn update || git pull || technically, this is two steps combined (git fetch, git merge) ||
+|| svn update || git pull || technically, this is two steps combined (git fetch, git merge) git pull --rebase does a rebase instead of a merge ||
 || svn update (to recover a single file) || git checkout HEAD filename || ||
 || svn update (to recover all deleted files) || git ls-files -d | xargs git checkout -- || ||
 || svn copy (to create a branch) || git branch (or git checkout -b) || ||
-|| svn copy (to create a tag) || git tag || ||
+|| svn copy (to create a tag) || git tag -a || ||
 || svn switch || git checkout branch ||  ||
 || svn merge || git merge || ||