knowledge/git-tips
1
0
Fork 0
mirror of https://github.com/namibia/tips.git synced 2025-01-23 23:28:30 +00:00
Code Issues Releases Activity

git push --force-with-lease tip

Browse Source
This commit is contained in:
weirdpattern 2016-08-10 13:08:56 -05:00
parent 7b4bcd1727
commit 7c9f3c88c5
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

@ -130,6 +130,7 @@ P.S: All these commands are tested on `git version 2.7.4 (Apple Git-66)`.
* [Adding Remote name](#adding-remote-name) * [Adding Remote name](#adding-remote-name)
* [Show the author, time and last revision made to each line of a given file](#show-the-author-time-and-last-revision-made-to-each-line-of-a-given-file) * [Show the author, time and last revision made to each line of a given file](#show-the-author-time-and-last-revision-made-to-each-line-of-a-given-file)
* [Group commits by authors and title](#group-commits-by-authors-and-title) * [Group commits by authors and title](#group-commits-by-authors-and-title)
* [Forced push but still ensure you don't overwrite other's work](#forced-push-but-still-ensure-you-dont-overwrite-others-work)
<!-- Don’t remove or change the comment below – that can break automatic updates. More info at <http://npm.im/doxie.inject>. --> <!-- 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 --> <!-- @doxie.inject end toc -->
@ -900,5 +901,10 @@ git blame <file-name>
git shortlog git shortlog
``` ```
## Forced push but still ensure you don't overwrite other's work
```sh
git push --force-with-lease <remote-name> <branch-name>
```
<!-- Don’t remove or change the comment below – that can break automatic updates. More info at <http://npm.im/doxie.inject>. --> <!-- Don’t remove or change the comment below – that can break automatic updates. More info at <http://npm.im/doxie.inject>. -->
<!-- @doxie.inject end --> <!-- @doxie.inject end -->

3
tips.json
View File

@ -389,4 +389,7 @@
}, { }, {
"title": "Group commits by authors and title", "title": "Group commits by authors and title",
"tip": "git shortlog" "tip": "git shortlog"
}, {
"title": "Forced push but still ensure you don't overwrite other's work",
"tip": "git push --force-with-lease <remote-name> <branch-name>"
}] }]