diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | Completion/Unix/Command/_git | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog index c1f1c75ca..69a22245b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,6 +13,8 @@ not complete already given file arguments and also to not list file completions if an option is being completed. + * unposted: Completion/Unix/Command/_git: Adjust some TODO items. + 2011-07-19 Peter Stephenson <pws@csr.com> * 29555: Src/exec.c: fix problem that shell failed to use file @@ -15135,5 +15137,5 @@ ***************************************************** * This is used by the shell to define $ZSH_PATCHLEVEL -* $Revision: 1.5402 $ +* $Revision: 1.5403 $ ***************************************************** diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git index 2fdc4d61c..ef85ad79c 100644 --- a/Completion/Unix/Command/_git +++ b/Completion/Unix/Command/_git @@ -83,11 +83,10 @@ _git-am () { local -a apply_options __git_setup_apply_options - # NOTE: --resolvemsg is only for internal use between git rebase and git am. + # NOTE: --rebasing and --resolvemsg are only for internal use between git + # rebase and git am. # TODO: --patch-format is undocumented. - # TODO: --ignore-date is incorrectly documented as being passed to git - # mailsplit. - # TODO: --rebasing, --rerere-autoupdate, and --no-rerere-autoupdate are + # TODO: --rerere-autoupdate and --no-rerere-autoupdate are # undocumented (and not implemented here). _arguments -S \ '(-s --signoff)'{-s,--signoff}'[add Signed-off-by: line to the commit message]' \ |