Re: [PATCH] bash completion: Add --autostash and --no-autostash to pull
El dimarts, 21 de novembre de 2017, a les 0:14:24 CET, Eric Sunshine va escriure: > On Mon, Nov 20, 2017 at 10:07 AM, Albert Astals Cid > > <albert.astals@kdab.com> 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 > > > --- > > diff --git a/contrib/completion/git-completion.bash > > b/contrib/completion/git- completion.bash > > index 539d7f84f..7ded58f38 100644 > > --- a/contrib/completion/git-completion.bash > > +++ b/contrib/completion/git-completion.bash > > @@ -1923,6 +1923,7 @@ _git_pull () > > > > --*) > > > > __gitcomp " > > > > --rebase --no-rebase > > > > + --autostash --no-autostash > > > > $__git_merge_options > > $__git_fetch_options > > > > " -- Albert Astals Cid | albert.astals@kdab.com | 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
[PATCH] 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 Signed-off-by: Albert Astals Cid <albert.astals@kdab.com> --- contrib/completion/git-completion.bash | 1 + 1 file changed, 1 insertion(+) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git- completion.bash index 539d7f84f..7ded58f38 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1923,6 +1923,7 @@ _git_pull () --*) __gitcomp " --rebase --no-rebase + --autostash --no-autostash $__git_merge_options $__git_fetch_options " -- 2.15.0
[PATCH] 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(+) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git- completion.bash index 539d7f84f..7ded58f38 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1923,6 +1923,7 @@ _git_pull () --*) __gitcomp " --rebase --no-rebase + --autostash --no-autostash $__git_merge_options $__git_fetch_options " -- 2.15.0
Re: Bug/Wish: bash completion for git pull --rebase doesn't include --autostash
Patch sent, please still CC me as i'm not on the list. Cheers, Albert El dimarts, 31 d’octubre de 2017, a les 18:56:22 CET, Stefan Beller va escriure: > On Tue, Oct 31, 2017 at 8:21 AM, Albert Astals Cid > > <albert.astals@kdab.com> wrote: > > git pull --rebase --autostash > > > > is a valid command but the --autostash autocompletion is not suggested > > after typing > > > > git pul --reb > > > Would be great if that could be added. > > > > Thanks :) > > > > Albert > > > > P.S: I'm not subscribed CC me if need me to test something > > Maybe you can propose a patch for this? > > Rough steps to success: > > git clone git://git.kernel.org/pub/scm/git/git.git/ > cd git > $EDIT contrib/completion/git-completion.bash >(look for _git_pull) > git commit -m "my first commit to git" > (This is paraphrased, see Documentation/SubmittingPatches > for a better idea how to craft commit messages) > git format-patch HEAD^ > git send-email 0001-xxx.patch > > > -- > > Albert Astals Cid | albert.astals@kdab.com | 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 -- Albert Astals Cid | albert.astals@kdab.com | 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
Bug/Wish: bash completion for git pull --rebase doesn't include --autostash
git pull --rebase --autostash is a valid command but the --autostash autocompletion is not suggested after typing git pul --reb
Fix wrong catalan translation
I'm not subscribed, please CC-me. Hi, i'm attaching a fix for the Catalan translation were it seems some Spanish sneaked in. Cheers, Albert P.S: Sending again since your list didn't like me sending this from @yahoo mail server From e8ae2db0d0f9736bd35d92a66fc46f59d762ad95 Mon Sep 17 00:00:00 2001 From: Albert Astals Cid aa...@kde.org Date: Fri, 19 Dec 2014 11:13:34 +0100 Subject: [PATCH] Encima is not a word in Catalan --- po/ca.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ca.po b/po/ca.po index 1fea047..128f63a 100644 --- a/po/ca.po +++ b/po/ca.po @@ -10730,7 +10730,7 @@ msgstr Canvis de $mb a $onto: #: git-rebase.sh:610 msgid First, rewinding head to replay your work on top of it... -msgstr Primer, rebobinant el cap per a reproduir el vostre treball encima... +msgstr Primer, rebobinant el cap per a reproduir el vostre treball a sobre... #: git-rebase.sh:620 #, sh-format -- 2.1.3
