mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-01-23 00:41:03 +01:00
Code Releases Activity

33178: _git: updates for Git 2.1.0

Browse source 
This incorporates changes mentioned in the release notes since 2.0.0.
This commit is contained in:
Øystein Walle 2014-09-16 10:28:09 +02:00 committed by Frank Terbeck
parent 56116a763a
commit d338cc5395
2 changed files with 23 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ChangeLog
View file

@ -5,6 +5,8 @@
* 33176: Completion/Unix/Command/_git: _git: Add missing --list to
git-tag
* 33178: Completion/Unix/Command/_git: _git: updates for Git 2.1.0
2014-09-23 Peter Stephenson <p.w.stephenson@ntlworld.com>
* unposted: NEWS: more minor tweaks.

26
Completion/Unix/Command/_git
View file

@ -876,8 +876,9 @@ _git-format-patch () {
'*--add-header=[add an arbitrary header to email headers]:header' \
'--cover-letter[generate a cover letter template]' \
'--notes=[append notes for the commit after the three-dash line]:: :__git_notes_refs' \
'( --no-signature)--signature=[add a signature]:signature' \
'(--signature )--no-signature[do not add a signature]' \
'( --no-signature --signature-file)--signature=[add a signature]:signature' \
'(--signature --signature-file)--no-signature[do not add a signature]' \
'(--signature --no-signature )--signature-file=[use contents of file as signature]' \
'--suffix=[use the given suffix for filenames]:filename suffix' \
'--quiet[suppress the output of the names of generated files]' \
'--no-binary[do not output contents of changes in binary files, only note that they differ]' \
@ -1903,7 +1904,7 @@ _git-config () {
core.packedGitWindowSize:'size of mappings of pack files:pack window size:->bytes'
core.packedGitLimit:'maximum number of bytes to map from pack files:maximum pack file map size:->bytes'
core.precomposeunicode:'revert the unicode decomposition of filenames done by Mac OS::->bool:false'
core.deltaBaseCacheLimit:'maximum size of cache for base objects:maximum base objects cache size:->bytes:16m'
core.deltaBaseCacheLimit:'maximum size of cache for base objects:maximum base objects cache size:->bytes:96m'
core.bigFileThreshold:'maximum size of files to compress:maximum compress size:->bytes:512m'
core.excludesfile:'additional file to use for exclusion:excludes file:_files'
core.askpass:'program to use for asking for passwords:password command:_path_commands'
@ -1911,7 +1912,7 @@ _git-config () {
core.pager:'pager to use for paginating output:pager:_path_commands'
core.whitespace:'list of common whitespace problems to notice::->core.whitespace'
core.fsyncobjectfiles:'fsync() when writing object files::->bool:false'
core.preloadindex:'use parallel index preload for operations like git diff::->bool:false'
core.preloadindex:'use parallel index preload for operations like git diff::->bool:true'
core.createObject:'take steps to prevent overwriting existing objects::->core.createObject:link'
core.checkstat:'determine which stat fields to match between the index and work tree::->core.checkstat:default'
core.notesRef:'show notes in given refs:refs:->string:refs/notes/commits'
@ -2092,6 +2093,7 @@ _git-config () {
guitool.title:'title of prompt dialog:prompt title:->string'
guitool.prompt:'prompt to display:prompt:->string'
grep.extendedRegexp:'enable --extended-regexp option by default (ignored when grep.patternType is set)::->bool:false'
grep.fullname:'enable --full-name option by default::->bool:false'
grep.lineNumber:'enable -n option by default::->bool:false'
grep.patternType:'default matching pattern type::->grep.patternType:default'
help.browser:'browser used to display help in web format::__git_browsers'
@ -2176,7 +2178,7 @@ _git-config () {
'man.*.path:path to use for the man viewer:absolute man tool path:_files -g "*(*)"'
merge.branchdesc:'populate the log message with the branch description text as well::->bool:false'
merge.conflictstyle:'style used for conflicted hunks::->merge.conflictstyle:merge'
merge.defaultToUpstream:'merge the upstream branches configured for the current branch by default::->bool:false'
merge.defaultToUpstream:'merge the upstream branches configured for the current branch by default::->bool:true'
merge.ff:'allow fast-forward merges::->merge.ff:true'
merge.log:'include summaries of merged commits in new merge commit messages::->bool:false'
merge.renameLimit:'number of files to consider when detecting copy/renames during merge:limit:->int'
@ -2327,6 +2329,7 @@ _git-config () {
'svn-remote.*.pushurl:URL to push to::_urls'
'svn-remote.*.branches:branch mappings:branch mapping:->string'
'svn-remote.*.tags:tag mappings:tag mapping:->string'
tag.sort:'Default sorting method:->string'
'tar.*.command:specify a shell command through which the tar output generated by git archive should be piped::_path_commands'
'tar.*.remote:enable <format> for use by remote clients via git-upload-archive::->bool'
tar.umask:'umask to apply::->umask'
@ -3237,6 +3240,8 @@ _git-repack () {
(( $+functions[_git-replace] )) ||
_git-replace () {
_arguments -w -S -s \
'--edit[edit existing object as base a starting point]' \
'--graft[rewrite the parents of a commit]' \
'(- *)-f[overwrite existing replace ref]' \
'(- 2)-d[delete existing replace refs]' \
'(- : *)-l[list replace refs]:pattern' \
@ -3548,6 +3553,13 @@ _git-show-branch () {
return ret
}
(( $+functions[_git-verify-commit] )) ||
_git-verify-commit () {
_arguments -w -S -s \
'(-v --verbose)'{-v,--verbose}'[print the contents of the commit object before validating it]' \
'*: :__git_commits'
}
(( $+functions[_git-verify-tag] )) ||
_git-verify-tag () {
_arguments -w -S -s \
@ -3672,6 +3684,8 @@ _git-send-email () {
'--annotate[review and edit each patch before sending it]' \
'--bcc=[Bcc: value for each email]: :_email_addresses' \
'--cc=[starting Cc: value for each email]: :_email_addresses' \
'--to-cover[Copy the To: list from the first file to the rest]' \
'--cc-cover[Copy the Cc: list from the first file to the rest]' \
'--compose[edit introductory message for patch series]' \
'--from=[specify sender]:email address:_email_addresses' \
'--in-reply-to=[specify contents of first In-Reply-To header]:message-id' \
@ -5067,6 +5081,7 @@ _git_commands () {
rerere:'reuse recorded resolution of conflicted merges'
rev-parse:'pick out and massage parameters for other git commands'
show-branch:'show branches and their commits'
verify-commit:'check GPG signature of commits'
verify-tag:'check GPG signature of tags'
whatchanged:'show commit-logs and differences they introduce')
@ -6450,6 +6465,7 @@ __git_diff-or-merge-tools () {
vimdiff
gvimdiff
vimdiff2
vimdiff3
gvimdiff2
emerge
ecmerge