diff --git a/pages/common/git-fetch.md b/pages/common/git-fetch.md new file mode 100644 index 000000000..3dfd3fed8 --- /dev/null +++ b/pages/common/git-fetch.md @@ -0,0 +1,11 @@ +# git fetch + +> Download objects and refs from a remote repository. + +- Fetch new branches and update remote-tracking branches: + +`git fetch {{remote_name}}` + +- Fetch the latest changes from all remote git servers: + +`git fetch --all` diff --git a/pages/common/git-init.md b/pages/common/git-init.md index 62ad8b9a5..374debae0 100644 --- a/pages/common/git-init.md +++ b/pages/common/git-init.md @@ -6,6 +6,6 @@ `git init` -- Initialize a barebones repository: +- Initialize a barebones repository, suitable for use as a remote over ssh: `git init --bare` diff --git a/pages/common/git-rebase.md b/pages/common/git-rebase.md new file mode 100644 index 000000000..93dd4e687 --- /dev/null +++ b/pages/common/git-rebase.md @@ -0,0 +1,19 @@ +# git rebase + +> Apply local commits on top of another branch's history. + +- Rebase your local branch interactively with the latest changes in local master: + +`git rebase -i master` + +- Rebase your local branch interactively with the latest changes from upstream: + +`git fetch origin; git rebase -i origin/master` + +- Handle an active rebase merge failure, after editing conflicting file(s): + +`git rebase --continue` + +- Abort a rebase in-progress: + +`git rebase --abort`