Skip to content
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

Jump to bottom

Add rebase commits section #23

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add rebase commits section #23

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 21 additions & 5 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ You can also read the [Portuguese](translation/README.pt-br.md) version.
* [Staging files](#staging-files)
* [Stashing files](#stashing-files)
* [Committing files](#committing-files)
* [Rebase commits](#rebase)
* [Branching and merging](#branching-and-merging)
* [Resetting](#resetting)
* [Git remote](#git-remote)
Expand Down Expand Up @@ -171,7 +172,18 @@ $ git commit -am 'insert commit message'
# Amending a commit
$ git commit --amend 'new commit message' or no message to maintain previous message

# Squashing commits together
# Squashing commits together using reset --soft
$ git reset --soft HEAD~number_of_commits
$ git commit
** WARNING: this will require force pushing commits, which is OK if this is on a branch before you push to master or create a Pull Request.
```

#### Rebase

Reapply commits on top of another base tip

```sh
# Rebasing commits
$ git rebase -i
This will give you an interface on your core editor:
# Commands:
Expand All @@ -182,10 +194,14 @@ This will give you an interface on your core editor:
# f, fixup = like "squash", but discard this commit's log message
# x, exec = run command (the rest of the line) using shell

# Squashing commits together using reset --soft
$ git reset --soft HEAD~number_of_commits
$ git commit
** WARNING: this will require force pushing commits, which is OK if this is on a branch before you push to master or create a Pull Request.
# Rebasing just some last commits
$ git rebase -i HEAD~[number_of_commits]

# Continue the rebase
$ git rebase --continue

# Abort the rebase
$ git rebase --abort
```

#### Branching and merging
Expand Down