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

Fix merge/rebase from master

This commit is contained in:
Jorge Marin 2016-06-20 21:01:17 +02:00
parent 4f2b8dfe99 418b227c12
commit 79da03dbe0
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
README.md
View File

@ -120,6 +120,7 @@ P.S: All these commands are tested on `git version 2.7.4 (Apple Git-66)`.
* [Find lines matching the pattern (regex or string) in tracked files](#find-lines-matching-the-pattern-regex-or-string-in-tracked-files)
* [Clone a shallow copy of a repository](#clone-a-shallow-copy-of-a-repository)
* [Search Commit log across all branches for given text](#search-commit-log-across-all-branches-for-given-text)
* [Get first commit in a branch (from master)](#get-first-commit-in-a-branch-from-master)
<!-- 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 -->
@ -834,5 +835,10 @@ git clone https://github.com/user/repo.git --depth 1
git log --all --grep='<given-text>'
```
## Get first commit in a branch (from master)
```sh
git log master..<branch-name> --oneline | tail -1
```
<!-- Don’t remove or change the comment below – that can break automatic updates. More info at <http://npm.im/doxie.inject>. -->
<!-- @doxie.inject end -->

3
tips.json
View File

@ -364,4 +364,7 @@
}, {
"title": "Search Commit log across all branches for given text",
"tip": "git log --all --grep='<given-text>'"
}, {
"title": "Get first commit in a branch (from master)",
"tip": "git log master..<branch-name> --oneline | tail -1"
}]