Skip to content

Commit 2569c74

Browse files
ck3gVitali Tatarintev
authored andcommitted
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.
1 parent 3a39252 commit 2569c74

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

README.md

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

765-
## Merge previous two commits into one.
765+
## Change previous two commits with an interactive rebase.
766766
```sh
767767
git rebase --interactive HEAD~2
768768
```

tips.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@
325325
"title": "List only the root and merge commits.",
326326
"tip": "git log --first-parent"
327327
}, {
328-
"title": "Merge previous two commits into one.",
328+
"title": "Change previous two commits with an interactive rebase.",
329329
"tip": "git rebase --interactive HEAD~2"
330330
}, {
331331
"title": "List all branch is WIP",

0 commit comments

Comments
 (0)