From bd3d67eb0072aedddf88790e0611a92545d66acd Mon Sep 17 00:00:00 2001
From: Samuel Tarin <starin@khanacademy.org>
Date: Thu, 19 Aug 2021 13:58:14 -0700
Subject: [PATCH] Add --force-with-lease and --no-edit to completion file

The commands
```
git push --force-with-lease [...]
```
and
```
git commit --amend --no-edit [...]
```
did not auto-complete, now they should

One very minor note is that now git commit --n<tab> will force you to
disambiguate between --no-edit and --no-verify hopefully users will be
able to live with that.

Issue: "none"

Test plan:
Test auto-complete in a terminal
---
 git-completion.bash | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/git-completion.bash b/git-completion.bash
index 141b060..bd47769 100644
--- a/git-completion.bash
+++ b/git-completion.bash
@@ -1276,7 +1276,7 @@ _git_commit ()
 	--*)
 		__gitcomp "
 			--all --author= --signoff --verify --no-verify
-			--edit --amend --include --only --interactive
+			--edit --no-edit --amend --include --only --interactive
 			--dry-run --reuse-message= --reedit-message=
 			--reset-author --file= --message= --template=
 			--cleanup= --untracked-files --untracked-files=
@@ -1735,7 +1735,7 @@ _git_push ()
 	--*)
 		__gitcomp "
 			--all --mirror --tags --dry-run --force --verbose
-			--receive-pack= --repo=
+			--force-with-lease --receive-pack= --repo=
 		"
 		return
 		;;