summaryrefslogtreecommitdiff
path: root/merge.c
diff options
context:
space:
mode:
authorPhil Hord <hordp@cisco.com>2015-03-26 15:15:09 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-03-26 18:41:24 (GMT)
commitfddfaf8a229710c50aeaacf6e40429965348493e (patch)
tree313ff6ba1c8f33a4b05a4125dcf9f4bf6f861960 /merge.c
parent282616c72d1d08a77ca4fe1186cb708c38408d87 (diff)
downloadgit-fddfaf8a229710c50aeaacf6e40429965348493e.zip
git-fddfaf8a229710c50aeaacf6e40429965348493e.tar.gz
git-fddfaf8a229710c50aeaacf6e40429965348493e.tar.bz2
git-push.txt: clean up force-with-lease wording
The help text for the --force-with-lease option to git-push does not parse cleanly. Clean up the wording and syntax to be more sensible. Also remove redundant information in the "--force-with-lease alone" description. Signed-off-by: Phil Hord <hordp@cisco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge.c')
0 files changed, 0 insertions, 0 deletions