aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2015-06-17 12:38:41 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2015-06-17 12:38:41 +0200
commitf668da82494983a2ae2c7f8c160ec1a109d335b8 (patch)
tree6a264547fd39d666c0b9f726eb94bfbd2cf92857
parent3ac8f8d767fea236ae6fcf72f9f3f23e56f4828a (diff)
Minor addition to History Cleanup
-rw-r--r--cheatsheet.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/cheatsheet.txt b/cheatsheet.txt
index 20894f7..3a66a5b 100644
--- a/cheatsheet.txt
+++ b/cheatsheet.txt
@@ -88,6 +88,8 @@ History Cleanup
words, master is now a prefix of our history which means we can
fastforward-only (--ff-only) merge this history into it):
+ git cout master
+ git pull
git cout feature
git merge master
git rebase master