mirror of
https://github.com/namibia/tips.git
synced 2024-12-23 10:38:58 +00:00
resolve merge conflict
This commit is contained in:
parent
4cf5bbdaa7
commit
614e5a9638
@ -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
|
||||
}]
|
||||
|
Loading…
Reference in New Issue
Block a user