From 1fa146ee3051cc2dd2418a78e80bd8d2b8201baf Mon Sep 17 00:00:00 2001 From: Seth Woodworth Date: Tue, 29 Dec 2015 17:54:20 -0500 Subject: [PATCH] Adds documentation for git rebase and git fetch --- pages/common/git-fetch.md | 7 +++++++ pages/common/git-rebase.md | 7 +++++++ 2 files changed, 14 insertions(+) create mode 100644 pages/common/git-fetch.md create mode 100644 pages/common/git-rebase.md diff --git a/pages/common/git-fetch.md b/pages/common/git-fetch.md new file mode 100644 index 000000000..1db31a09d --- /dev/null +++ b/pages/common/git-fetch.md @@ -0,0 +1,7 @@ +# git fetch + +> Download objects and refs from a remote repository + +- Fetch the latest changes from all remote git servers + +`git fetch --all` diff --git a/pages/common/git-rebase.md b/pages/common/git-rebase.md new file mode 100644 index 000000000..93ff2ae56 --- /dev/null +++ b/pages/common/git-rebase.md @@ -0,0 +1,7 @@ +# git rebase + +> Apply local commits on top of another branch's history + +- Rebase your local branch with the latest changes in master + +`git rebase -i master` (Then follow the directions in the terminal for merge conflicts)