mirror of
https://github.com/namibia/tips.git
synced 2024-09-25 04:39:01 +00:00
Merge pull request #49 from munendrasn/master
merge previous two commits into one.
This commit is contained in:
commit
67f84e141c
@ -101,6 +101,7 @@
|
||||
* [File diff between staging and the last file version.](https://github.com/git-tips/tips#file-diff-between-staging-and-the-last-file-version)
|
||||
* [Extract file from another branch.](https://github.com/git-tips/tips#extract-file-from-another-branch)
|
||||
* [List only the root and merge commits.](https://github.com/git-tips/tips#list-only-the-root-and-merge-commits)
|
||||
* [Merge previous two commits into one.](https://github.com/git-tips/tips#merge-previous-two-commits-into-one)
|
||||
|
||||
<!-- Don’t remove or change the comment below – that can break automatic updates. More info at <http://npm.im/doxie.inject>. -->
|
||||
<!-- @doxie.inject end toc -->
|
||||
@ -689,5 +690,10 @@ git show <banch_name>:<file_name>
|
||||
git log --first-parent
|
||||
```
|
||||
|
||||
## Merge previous two commits into one.
|
||||
```sh
|
||||
git rebase --interactive HEAD~2
|
||||
```
|
||||
|
||||
<!-- Don’t remove or change the comment below – that can break automatic updates. More info at <http://npm.im/doxie.inject>. -->
|
||||
<!-- @doxie.inject end -->
|
||||
|
Loading…
Reference in New Issue
Block a user