From a5db8297085b8e2068398b095c8e3c53febcf05d Mon Sep 17 00:00:00 2001
From: S N Munendra <sn.munendra52@gmail.com>
Date: Sat, 18 Jun 2016 19:58:58 +0530
Subject: [PATCH 1/2] Add tip to search commit log

---
 README.md | 6 ++++++
 tips.json | 5 ++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index b06c387..9e1d253 100644
--- a/README.md
+++ b/README.md
@@ -119,6 +119,7 @@ P.S: All these commands are tested on `git version 2.7.4 (Apple Git-66)`.
 * [Show all local branches ordered by recent commits](#show-all-local-branches-ordered-by-recent-commits)
 * [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)
 
 <!-- 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 -->
@@ -823,5 +824,10 @@ git grep --heading --line-number 'foo bar'
 git clone https://github.com/user/repo.git --depth 1
 ```
 
+## Search Commit log across all branches for given text
+```sh
+git log --all --grep='<given-text>'
+```
+
 <!-- Don’t remove or change the comment below – that can break automatic updates. More info at <http://npm.im/doxie.inject>. -->
 <!-- @doxie.inject end -->
diff --git a/tips.json b/tips.json
index acfcf78..a6f8918 100644
--- a/tips.json
+++ b/tips.json
@@ -361,4 +361,7 @@
 }, {
     "title": "Clone a shallow copy of a repository",
     "tip": "git clone https://github.com/user/repo.git --depth 1"
-}]
\ No newline at end of file
+}, {
+    "title": "Search Commit log across all branches for given text",
+    "tip": "git log --all --grep='<given-text>'"
+}]

From 614e5a9638a169ee652d9731d895d653b3baba4e Mon Sep 17 00:00:00 2001
From: S N Munendra <sn.munendra52@gmail.com>
Date: Sun, 19 Jun 2016 20:40:54 +0530
Subject: [PATCH 2/2] resolve merge conflict

---
 tips.json | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/tips.json b/tips.json
index 8eb7c56..5d31a3a 100644
--- a/tips.json
+++ b/tips.json
@@ -361,10 +361,7 @@
 }, {
     "title": "Clone a shallow copy of a repository",
     "tip": "git clone https://github.com/user/repo.git --depth 1"
-<<<<<<< HEAD
 }, {
     "title": "Search Commit log across all branches for given text",
     "tip": "git log --all --grep='<given-text>'"
-=======
->>>>>>> 93e25eb7185e0e98398a170126f9395f26096798
 }]