knowledge
/
git-tips
mirror of https://github.com/namibia/tips.git
1
0
Fork 0
Code Issues Releases Activity

Change an interactive rebase description 

Interactive rebase can be used not only for merging files together. Files can be also be changed or updated without squashing them.
This commit is contained in:
Vitaly Tatarintsev 2016-06-28 11:27:19 +02:00 committed by Vitali Tatarintev
parent 3a392529fe
commit 2569c74f03
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -107,7 +107,7 @@ P.S: All these commands are tested on `git version 2.7.4 (Apple Git-66)`.
* [Checkout a new branch without any history](#checkout-a-new-branch-without-any-history) * [Checkout a new branch without any history](#checkout-a-new-branch-without-any-history)
* [Extract file from another branch.](#extract-file-from-another-branch) * [Extract file from another branch.](#extract-file-from-another-branch)
* [List only the root and merge commits.](#list-only-the-root-and-merge-commits) * [List only the root and merge commits.](#list-only-the-root-and-merge-commits)
* [Merge previous two commits into one.](#merge-previous-two-commits-into-one) * [Change previous two commits with an interactive rebase.](#change-previous-two-commits-with-an-interactive-rebase)
* [List all branch is WIP](#list-all-branch-is-wip) * [List all branch is WIP](#list-all-branch-is-wip)
* [Find guilty with binary search](#find-guilty-with-binary-search) * [Find guilty with binary search](#find-guilty-with-binary-search)
* [Bypass pre-commit and commit-msg githooks](#bypass-pre-commit-and-commit-msg-githooks) * [Bypass pre-commit and commit-msg githooks](#bypass-pre-commit-and-commit-msg-githooks)
@ -762,7 +762,7 @@ git show <branch_name>:<file_name>
git log --first-parent git log --first-parent
``` ```
## Merge previous two commits into one. ## Change previous two commits with an interactive rebase.
```sh ```sh
git rebase --interactive HEAD~2 git rebase --interactive HEAD~2
``` ```

2
tips.json
View File

@ -325,7 +325,7 @@
"title": "List only the root and merge commits.", "title": "List only the root and merge commits.",
"tip": "git log --first-parent" "tip": "git log --first-parent"
}, { }, {
"title": "Merge previous two commits into one.", "title": "Change previous two commits with an interactive rebase.",
"tip": "git rebase --interactive HEAD~2" "tip": "git rebase --interactive HEAD~2"
}, { }, {
"title": "List all branch is WIP", "title": "List all branch is WIP",