From bad3155f1fc6dc533e0d13f089a92d3cdfc0fc2a Mon Sep 17 00:00:00 2001 From: Thomas Stringer Date: Wed, 15 Jul 2015 06:24:22 -0400 Subject: [PATCH 1/2] Added a couple of common upstream commands to track and check status --- README.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/README.md b/README.md index 0998ff6..42d1a30 100644 --- a/README.md +++ b/README.md @@ -36,5 +36,14 @@ git branch --merged git checkout - ``` +# List all branches and their upstreams, as well as last commit on branch +```sh +git branch -vv +``` +# Track upstream branch + +```sh +git branch -u origin/mybranch +``` \ No newline at end of file From f8f15467d68aa41f01e230cbe0ace45b5ca2565b Mon Sep 17 00:00:00 2001 From: Thomas Stringer Date: Wed, 15 Jul 2015 06:25:24 -0400 Subject: [PATCH 2/2] Changed headers of tips to be smaller text --- README.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 42d1a30..62e270f 100644 --- a/README.md +++ b/README.md @@ -1,48 +1,48 @@ -# Overwrite pull +## Overwrite pull ```sh git fetch --all git reset --hard origin/master ``` -# List of all the files changed in a commit +## List of all the files changed in a commit ```sh git ls-tree --name-only -r ``` -# Git reset first commit +## Git reset first commit ```sh git update-ref -d HEAD ``` -# List all the conflicted files +## List all the conflicted files ```sh git diff --name-only --diff-filter=U ``` -# List all branches that are already merged into master +## List all branches that are already merged into master ```sh git checkout master git branch --merged ``` -# Quickly switch to the previous branch +## Quickly switch to the previous branch ```sh git checkout - ``` -# List all branches and their upstreams, as well as last commit on branch +## List all branches and their upstreams, as well as last commit on branch ```sh git branch -vv ``` -# Track upstream branch +## Track upstream branch ```sh git branch -u origin/mybranch