Skip to content

git-rebase, git-fetch: add pages #473

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jan 21, 2016
Merged

git-rebase, git-fetch: add pages #473

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1fa146e
Adds documentation for git rebase and git fetch
Dec 29, 2015
15edb80
adds better default option for git-fetch
Dec 29, 2015
a0f62e5
Expands description of --bare git-init option
Dec 30, 2015
9c70b75
adds more examples for git-rebase
Dec 30, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions pages/common/git-fetch.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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`
2 changes: 1 addition & 1 deletion pages/common/git-init.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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`
19 changes: 19 additions & 0 deletions pages/common/git-rebase.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Copy link
Contributor

@leostera leostera Dec 30, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Double space between branch and interactively


`git fetch origin; git rebase -i origin/master`

- Handling an active rebase merge failure, after editing conflicting file(s)

`git rebase --continue`

- Abort a rebase in-progress

`git rebase --abort`