From 8a8611c5904c44a568964fc81dbb0e8e9c372c89 Mon Sep 17 00:00:00 2001 From: Warren Toomey Date: Sat, 27 Feb 2016 15:24:59 +1000 Subject: [PATCH] misc/git_notes.txt: How to fetch from Github and review the changes before merging. --- misc/git_notes.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/misc/git_notes.txt b/misc/git_notes.txt index 0c7dec8..8a547c2 100644 --- a/misc/git_notes.txt +++ b/misc/git_notes.txt @@ -6,4 +6,5 @@ git config --global user.email wkt@tuhs.org To bring your own ocal repository up to date with Github: git fetch origin + git diff master origin/master git merge origin/master