Skip to content

Commit 08096c7

Browse files
committed
fixes #58
1 parent 3357955 commit 08096c7

File tree

2 files changed

+9
-0
lines changed

2 files changed

+9
-0
lines changed

README.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,7 @@ P.S: All these commands are tested on `git version 2.7.4 (Apple Git-66)`.
136136
* [Group commits by authors and title](#group-commits-by-authors-and-title)
137137
* [Forced push but still ensure you don't overwrite other's work](#forced-push-but-still-ensure-you-dont-overwrite-others-work)
138138
* [Show how many lines does an author contribute](#show-how-many-lines-does-an-author-contribute)
139+
* [Revert: Reverting an entire merge](#revert-reverting-an-entire-merge)
139140
* [Number of commits in a branch](#number-of-commits-in-a-branch)
140141

141142
<!-- Don’t remove or change the comment below – that can break automatic updates. More info at <http://npm.im/doxie.inject>. -->
@@ -931,6 +932,11 @@ git log --author='_Your_Name_Here_' --pretty=tformat: --numstat | awk '{ add +=
931932
", add, subs, loc }' - # on Mac OSX
932933
```
933934

935+
## Revert: Reverting an entire merge
936+
```sh
937+
git revert -m 1 <commit-ish>
938+
```
939+
934940
## Number of commits in a branch
935941
```sh
936942
git rev-list --count <branch-name>

tips.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -397,6 +397,9 @@
397397
"title": "Show how many lines does an author contribute",
398398
"tip": "git log --author='_Your_Name_Here_' --pretty=tformat: --numstat | gawk '{ add += $1; subs += $2; loc += $1 - $2 } END { printf \"added lines: %s removed lines: %s total lines: %s\n\", add, subs, loc }' -",
399399
"alternatives": ["git log --author='_Your_Name_Here_' --pretty=tformat: --numstat | awk '{ add += $1; subs += $2; loc += $1 - $2 } END { printf \"added lines: %s, removed lines: %s, total lines: %s\n\", add, subs, loc }' - # on Mac OSX"]
400+
},{
401+
"title": "Revert: Reverting an entire merge",
402+
"tip": "git revert -m 1 <commit-ish>"
400403
},{
401404
"title": "Number of commits in a branch",
402405
"tip": "git rev-list --count <branch-name>"

0 commit comments

Comments
 (0)