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

resolve merge conflict

This commit is contained in:
S N Munendra 2016-06-19 20:40:54 +05:30
parent 4cf5bbdaa7
commit 614e5a9638
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tips.json
View File

@ -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
}]