Srinidhi Kaushik <shrinidhi.kaushik@xxxxxxxxx> writes: > The `--force-with-lease[=<refname>[:<expect]]` option in `git-push` > makes sure that refs on remote aren't clobbered by unexpected changes > when the "<refname>" and "<expect>" ref values are explicitly specified. If you did a feature with different semantics to satisfy Dscho's need, then this is no longer "make force-with-lease safer", I would think. Hopefully it is just the cover letter. > The new option `--force-if-includes` will allow forcing an update only > if the tip of the remote-tracking ref has been integrated locally. > Using this along with `--force-with-lease`, during the time of push > can help preventing unintended remote overwrites. "if-includes" sounds quite sensible. I think you want to lose the word "lease" from the configuration variable name. I do not think it should be on by default, though. Thanks.