Skip to contentSkip to conversation

bash completion: Add --autostash and --no-autostash to pull

PATCH In review Albert Astals Cid 2 participants 3 messages Nov 20, 2017 – Nov 21, 2017

lore
Share & tools
lore

Albert Astals Cid

author
#0 lore raw

PATCH 1/1 bash completion: Add --autostash and --no-autostash to pull

Ideally we should only autocomplete if pull has --rebase since they only work with it but could not figure out how to do that and the error message of doing git pull --autostash points out that you need --rebase so i guess it's good enough

---
 contrib/completion/git-completion.bash | 1 +
 1 file changed, 1 insertion(+)
contrib/completion/git- renamed from contrib/completion/git-completion.bash +0 -0

completion.bash
index 539d7f84f..7ded58f38 100644

contrib/completion/git-completion.bash +1 -0
@@ -1923,6 +1923,7 @@ _git_pull ()
 	--*)
 		__gitcomp "
 			--rebase --no-rebase
+			--autostash --no-autostash
 			$__git_merge_options
 			$__git_fetch_options
 		"
Signature · 1 line
2.15.0
#1 lore raw
Quoted 4 lines · Albert Astals Cid

Ideally we should only autocomplete if pull has --rebase since they only work with it but could not figure out how to do that and the error message of doing git pull --autostash points out that you need --rebase so i guess it's good enough

Missing Signed-off-by:. See Documentation/SubmittingPatches. Thanks.

Quoted 14 lines

---

contrib/completion/git- renamed from contrib/completion/git-completion.bash +0 -0

completion.bash
index 539d7f84f..7ded58f38 100644

contrib/completion/git-completion.bash +1 -0
@@ -1923,6 +1923,7 @@ _git_pull ()
        --*)
                __gitcomp "
                        --rebase --no-rebase
+                       --autostash --no-autostash
                        $__git_merge_options
                        $__git_fetch_options
                "
author
#2 lore raw

El dimarts, 21 de novembre de 2017, a les 0:14:24 CET, Eric Sunshine va escriure:

Quoted 9 lines

On Mon, Nov 20, 2017 at 10:07 AM, Albert Astals Cid

Quoted 4 lines · <[email protected]> wrote:

Ideally we should only autocomplete if pull has --rebase since they only work with it but could not figure out how to do that and the error message of doing git pull --autostash points out that you need --rebase so i guess it's good enough

Missing Signed-off-by:. See Documentation/SubmittingPatches. Thanks.

Added.

Cheers,
Albert

Quoted 21 lines
Quoted 21 lines

---

(quoted diff) +0 -0

b/contrib/completion/git- completion.bash
index 539d7f84f..7ded58f38 100644

contrib/completion/git-completion.bash +1 -0
@@ -1923,6 +1923,7 @@ _git_pull ()
 
        --*)
 
                __gitcomp "
 
                        --rebase --no-rebase
 
+                       --autostash --no-autostash
 
                        $__git_merge_options
                        $__git_fetch_options
 
                "
Signature · 4 lines
Albert Astals Cid | [email protected] | Software Engineer
Klarälvdalens Datakonsult AB, a KDAB Group company
Tel: Sweden (HQ) +46-563-540090, USA +1-866-777-KDAB(5322)
KDAB - The Qt, C++ and OpenGL Experts