From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 6 Dec 2017 17:09:02 +0000 (-0800)
Subject: Merge branch 'tz/complete-branch-copy' into maint
X-Git-Tag: v2.15.2~9
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/2db93a80d37d463ab66dc71ba4e10cbaae8f807f?ds=inline;hp=-c

Merge branch 'tz/complete-branch-copy' into maint

Command line completion (in contrib/) has been taught about the
"--copy" option of "git branch".

* tz/complete-branch-copy:
completion: add '--copy' option to 'git branch'
---

2db93a80d37d463ab66dc71ba4e10cbaae8f807f
diff --combined contrib/completion/git-completion.bash
index a54cc2cef6,8aca836ef9..17929b0809
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@@ -111,7 -111,8 +111,7 @@@ __git (
  #   GNU General Public License for more details.
  #
  #   You should have received a copy of the GNU General Public License
 -#   along with this program; if not, write to the Free Software Foundation,
 -#   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 +#   along with this program; if not, see <http://www.gnu.org/licenses/>.
  #
  #   The latest version of this software can be obtained here:
  #
@@@ -1204,7 -1205,7 +1204,7 @@@ _git_branch (
  			--color --no-color --verbose --abbrev= --no-abbrev
  			--track --no-track --contains --no-contains --merged --no-merged
  			--set-upstream-to= --edit-description --list
- 			--unset-upstream --delete --move --remotes
+ 			--unset-upstream --delete --move --copy --remotes
  			--column --no-column --sort= --points-at
  			"
  		;;
@@@ -1249,8 -1250,7 +1249,8 @@@ _git_checkout (
  	--*)
  		__gitcomp "
  			--quiet --ours --theirs --track --no-track --merge
 -			--conflict= --orphan --patch
 +			--conflict= --orphan --patch --detach --ignore-skip-worktree-bits
 +			--recurse-submodules --no-recurse-submodules
  			"
  		;;
  	*)
@@@ -1385,7 -1385,7 +1385,7 @@@ _git_describe (
  		__gitcomp "
  			--all --tags --contains --abbrev= --candidates=
  			--exact-match --debug --long --match --always --first-parent
 -			--exclude
 +			--exclude --dirty --broken
  			"
  		return
  	esac
@@@ -2336,23 -2336,14 +2336,23 @@@ _git_config (
  	esac
  	__gitcomp "
  		add.ignoreErrors
 +		advice.amWorkDir
  		advice.commitBeforeMerge
  		advice.detachedHead
  		advice.implicitIdentity
 -		advice.pushNonFastForward
 +		advice.pushAlreadyExists
 +		advice.pushFetchFirst
 +		advice.pushNeedsForce
 +		advice.pushNonFFCurrent
 +		advice.pushNonFFMatching
 +		advice.pushUpdateRejected
  		advice.resolveConflict
 +		advice.rmHints
  		advice.statusHints
 +		advice.statusUoption
  		alias.
  		am.keepcr
 +		am.threeWay
  		apply.ignorewhitespace
  		apply.whitespace
  		branch.autosetupmerge
@@@ -2415,8 -2406,6 +2415,8 @@@
  		core.autocrlf
  		core.bare
  		core.bigFileThreshold
 +		core.checkStat
 +		core.commentChar
  		core.compression
  		core.createObject
  		core.deltaBaseCacheLimit
@@@ -2426,8 -2415,6 +2426,8 @@@
  		core.fileMode
  		core.fsyncobjectfiles
  		core.gitProxy
 +		core.hideDotFiles
 +		core.hooksPath
  		core.ignoreStat
  		core.ignorecase
  		core.logAllRefUpdates
@@@ -2435,30 -2422,20 +2435,30 @@@
  		core.notesRef
  		core.packedGitLimit
  		core.packedGitWindowSize
 +		core.packedRefsTimeout
  		core.pager
 +		core.precomposeUnicode
  		core.preferSymlinkRefs
  		core.preloadindex
 +		core.protectHFS
 +		core.protectNTFS
  		core.quotepath
  		core.repositoryFormatVersion
  		core.safecrlf
  		core.sharedRepository
  		core.sparseCheckout
 +		core.splitIndex
 +		core.sshCommand
  		core.symlinks
  		core.trustctime
  		core.untrackedCache
  		core.warnAmbiguousRefs
  		core.whitespace
  		core.worktree
 +		credential.helper
 +		credential.useHttpPath
 +		credential.username
 +		credentialCache.ignoreSIGHUP
  		diff.autorefreshindex
  		diff.external
  		diff.ignoreSubmodules
@@@ -2490,19 -2467,15 +2490,19 @@@
  		format.thread
  		format.to
  		gc.
 +		gc.aggressiveDepth
  		gc.aggressiveWindow
  		gc.auto
 +		gc.autoDetach
  		gc.autopacklimit
 +		gc.logExpiry
  		gc.packrefs
  		gc.pruneexpire
  		gc.reflogexpire
  		gc.reflogexpireunreachable
  		gc.rerereresolved
  		gc.rerereunresolved
 +		gc.worktreePruneExpire
  		gitcvs.allbinary
  		gitcvs.commitmsgannotation
  		gitcvs.dbTableNamePrefix
@@@ -2641,8 -2614,6 +2641,8 @@@
  		sendemail.thread
  		sendemail.to
  		sendemail.validate
 +		sendemail.smtpbatchsize
 +		sendemail.smtprelogindelay
  		showbranch.default
  		status.relativePaths
  		status.showUntrackedFiles