Compare commits

..

1 Commits

Author SHA1 Message Date
74a805017a Add aliases for working with autosquash rebases
* Rename the `squash` alias to `prepare` to repurpose it.
* Change `squash` alias to `git commit --squash=<commit>`.
* Add `fixup` alias to `git commit --fixup=<commit>`.
* Set the `rebase.autoSquash` config option to `true`.
2018-08-13 12:19:28 +01:00

View File

@ -8,10 +8,10 @@ rather than remembering the plumbing term of a specific command.
* `abandon` abandons all local changes leave a clean repository.
* `unstage` unstage staged changes, shorthand for `git reset -q HEAD --`.
* `amend` amends the last commit, shorthand for `git commit --amend`.
* `fixup` prepare a fixup commit for use with `git rebase --autosquash`,
shorthand for `git commit --fixup=<commit>`.
* `squash` prepare a squash commit for use with `git rebase --autosquash`,
shorthand for `git commit --squash=<commit>`.
* `fixup` prepare a fixup commit for use with
`git rebase --interactive --autosquash`, shorthand for `git commit --fixup`.
* `squash` prepare a squash commit for use with
`git rebase --interactive --autosquash`, shorthand for `git commit --squash`.
* `prepare` prepare a branch for merging into another, shorthand for
`git rebase --interactive --fork-point`.
* `list` list local branches, a shorthand for `git branch`.