From 1f7c49d2701db7214f9a70de2de6c00755fcada9 Mon Sep 17 00:00:00 2001 From: Stephen Coady Date: Fri, 13 Oct 2017 23:36:53 +0100 Subject: [PATCH] first two --- git-tricks.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/git-tricks.md b/git-tricks.md index 5905a1f64..b285f6f39 100644 --- a/git-tricks.md +++ b/git-tricks.md @@ -27,6 +27,15 @@ category: Git # delete remote branch git push origin :$branchname + +## Collaboration + + # Rebase your changes on top of the remote master + git pull --rebase upstream master + + # Squash multiple commits into one for a cleaner git log + # (on the following screen change the word pick to either 'f' or 's') + git rebase -i $commit_ref Submodules ----------