* PATCH: Add --abort to options for 'git am' in _git
@ 2008-08-28 13:38 Frank Terbeck
2008-08-30 5:46 ` Mikael Magnusson
0 siblings, 1 reply; 3+ messages in thread
From: Frank Terbeck @ 2008-08-28 13:38 UTC (permalink / raw)
To: zsh workers
Index: Completion/Unix/Command/_git
===================================================================
RCS file: /cvsroot/zsh/zsh/Completion/Unix/Command/_git,v
retrieving revision 1.89
diff -u -r1.89 _git
--- Completion/Unix/Command/_git 24 Aug 2008 19:48:09 -0000 1.89
+++ Completion/Unix/Command/_git 28 Aug 2008 13:33:14 -0000
@@ -1354,6 +1354,7 @@
_git-am () {
_arguments \
'--3way[use 3-way merge if patch does not apply cleanly]' \
+ '--abort[restore the original branch and abort the patching operation.]' \
'--binary[pass "--allow-binary-replacement" to "git-apply"]' \
'--dotest=-[use given directory as working area instead of .dotest]:directory:_directories' \
'--interactive[apply patches interactively]' \
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: PATCH: Add --abort to options for 'git am' in _git
2008-08-28 13:38 PATCH: Add --abort to options for 'git am' in _git Frank Terbeck
@ 2008-08-30 5:46 ` Mikael Magnusson
2008-08-30 9:25 ` Frank Terbeck
0 siblings, 1 reply; 3+ messages in thread
From: Mikael Magnusson @ 2008-08-30 5:46 UTC (permalink / raw)
To: zsh workers
2008/8/28 Frank Terbeck <ft@bewatermyfriend.org>:
> Index: Completion/Unix/Command/_git
> ===================================================================
> RCS file: /cvsroot/zsh/zsh/Completion/Unix/Command/_git,v
> retrieving revision 1.89
> diff -u -r1.89 _git
> --- Completion/Unix/Command/_git 24 Aug 2008 19:48:09 -0000 1.89
> +++ Completion/Unix/Command/_git 28 Aug 2008 13:33:14 -0000
> @@ -1354,6 +1354,7 @@
> _git-am () {
> _arguments \
> '--3way[use 3-way merge if patch does not apply cleanly]' \
> + '--abort[restore the original branch and abort the patching operation.]' \
> '--binary[pass "--allow-binary-replacement" to "git-apply"]' \
> '--dotest=-[use given directory as working area instead of .dotest]:directory:_directories' \
> '--interactive[apply patches interactively]' \
A very minor nit I just noticed when I updated cvs, none of the other help
texts end with a period.
--
Mikael Magnusson
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: PATCH: Add --abort to options for 'git am' in _git
2008-08-30 5:46 ` Mikael Magnusson
@ 2008-08-30 9:25 ` Frank Terbeck
0 siblings, 0 replies; 3+ messages in thread
From: Frank Terbeck @ 2008-08-30 9:25 UTC (permalink / raw)
To: zsh workers
Mikael Magnusson <mikachu@gmail.com>:
[...]
> A very minor nit I just noticed when I updated cvs, none of the other help
> texts end with a period.
Yeah, damn.
I guess removing the dot in the sandbox of a person with commit access
is quicker than applying this patch, but anyway: :-)
Index: Completion/Unix/Command/_git
===================================================================
RCS file: /cvsroot/zsh/zsh/Completion/Unix/Command/_git,v
retrieving revision 1.92
diff -u -r1.92 _git
--- Completion/Unix/Command/_git 29 Aug 2008 02:39:21 -0000 1.92
+++ Completion/Unix/Command/_git 30 Aug 2008 09:20:43 -0000
@@ -1354,7 +1354,7 @@
_git-am () {
_arguments \
'--3way[use 3-way merge if patch does not apply cleanly]' \
- '--abort[restore the original branch and abort the patching operation.]' \
+ '--abort[restore the original branch and abort the patching operation]' \
'--binary[pass "--allow-binary-replacement" to "git-apply"]' \
'--dotest=-[use given directory as working area instead of .dotest]:directory:_directories' \
'--interactive[apply patches interactively]' \
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2008-08-30 9:26 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-08-28 13:38 PATCH: Add --abort to options for 'git am' in _git Frank Terbeck
2008-08-30 5:46 ` Mikael Magnusson
2008-08-30 9:25 ` Frank Terbeck
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/zsh/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).