From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 17 Sep 2012 22:59:34 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.8.0-rc0~41
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/b61f55be0060ab47b154d979f919dd969f29d314?hp=-c

Merge branch 'maint'

* maint:
t/perf: add "trash directory" to .gitignore
Add missing -z to git check-attr usage text for consistency with man page
git-jump: ignore (custom) prefix in diff mode
Documentation: indent-with-non-tab uses "equivalent tabs" not 8
completion: add --no-edit to git-commit
---

b61f55be0060ab47b154d979f919dd969f29d314
diff --combined Documentation/config.txt
index 6416cae511,122e3c4996..11f320b962
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@@ -559,8 -559,9 +559,9 @@@ core.whitespace:
  * `space-before-tab` treats a space character that appears immediately
    before a tab character in the initial indent part of the line as an
    error (enabled by default).
- * `indent-with-non-tab` treats a line that is indented with 8 or more
-   space characters as an error (not enabled by default).
+ * `indent-with-non-tab` treats a line that is indented with space
+   characters instead of the equivalent tabs as an error (not enabled by
+   default).
  * `tab-in-indent` treats a tab character in the initial indent part of
    the line as an error (not enabled by default).
  * `blank-at-eof` treats blank lines added at the end of file as an error
@@@ -1210,16 -1211,8 +1211,16 @@@ gitweb.snapshot:
  grep.lineNumber::
  	If set to true, enable '-n' option by default.
  
 +grep.patternType::
 +	Set the default matching behavior. Using a value of 'basic', 'extended',
 +	'fixed', or 'perl' will enable the '--basic-regexp', '--extended-regexp',
 +	'--fixed-strings', or '--perl-regexp' option accordingly, while the
 +	value 'default' will return to the default matching behavior.
 +
  grep.extendedRegexp::
 -	If set to true, enable '--extended-regexp' option by default.
 +	If set to true, enable '--extended-regexp' option by default. This
 +	option is ignored when the 'grep.patternType' option is set to a value
 +	other than 'default'.
  
  gpg.program::
  	Use this custom program instead of "gpg" found on $PATH when
diff --combined builtin/check-attr.c
index e1ff575daa,9000c2db51..075d01d30c
--- a/builtin/check-attr.c
+++ b/builtin/check-attr.c
@@@ -8,19 -8,19 +8,19 @@@ static int all_attrs
  static int cached_attrs;
  static int stdin_paths;
  static const char * const check_attr_usage[] = {
 -"git check-attr [-a | --all | attr...] [--] pathname...",
 -"git check-attr --stdin [-z] [-a | --all | attr...] < <list-of-paths>",
 +N_("git check-attr [-a | --all | attr...] [--] pathname..."),
- N_("git check-attr --stdin [-a | --all | attr...] < <list-of-paths>"),
++N_("git check-attr --stdin [-z] [-a | --all | attr...] < <list-of-paths>"),
  NULL
  };
  
  static int null_term_line;
  
  static const struct option check_attr_options[] = {
 -	OPT_BOOLEAN('a', "all", &all_attrs, "report all attributes set on file"),
 -	OPT_BOOLEAN(0,  "cached", &cached_attrs, "use .gitattributes only from the index"),
 -	OPT_BOOLEAN(0 , "stdin", &stdin_paths, "read file names from stdin"),
 +	OPT_BOOLEAN('a', "all", &all_attrs, N_("report all attributes set on file")),
 +	OPT_BOOLEAN(0,  "cached", &cached_attrs, N_("use .gitattributes only from the index")),
 +	OPT_BOOLEAN(0 , "stdin", &stdin_paths, N_("read file names from stdin")),
  	OPT_BOOLEAN('z', NULL, &null_term_line,
 -		"input paths are terminated by a null character"),
 +		N_("input paths are terminated by a null character")),
  	OPT_END()
  };
  
diff --combined contrib/completion/git-completion.bash
index 1b43329ed7,d743e56d18..be800e09bd
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@@ -875,15 -875,11 +875,15 @@@ _git_branch (
  	done
  
  	case "$cur" in
 +	--set-upstream-to=*)
 +		__gitcomp "$(__git_refs)" "" "${cur##--set-upstream-to=}"
 +		;;
  	--*)
  		__gitcomp "
  			--color --no-color --verbose --abbrev= --no-abbrev
  			--track --no-track --contains --merged --no-merged
 -			--set-upstream --edit-description --list
 +			--set-upstream-to= --edit-description --list
 +			--unset-upstream
  			"
  		;;
  	*)
@@@ -1018,7 -1014,8 +1018,8 @@@ _git_commit (
  	--*)
  		__gitcomp "
  			--all --author= --signoff --verify --no-verify
- 			--edit --amend --include --only --interactive
+ 			--edit --no-edit
+ 			--amend --include --only --interactive
  			--dry-run --reuse-message= --reedit-message=
  			--reset-author --file= --message= --template=
  			--cleanup= --untracked-files --untracked-files=
@@@ -1075,7 -1072,7 +1076,7 @@@ _git_diff (
  }
  
  __git_mergetools_common="diffuse ecmerge emerge kdiff3 meld opendiff
 -			tkdiff vimdiff gvimdiff xxdiff araxis p4merge bc3
 +			tkdiff vimdiff gvimdiff xxdiff araxis p4merge bc3 codecompare
  "
  
  _git_difftool ()
@@@ -2036,7 -2033,7 +2037,7 @@@ _git_config (
  
  _git_remote ()
  {
 -	local subcommands="add rename rm set-head set-branches set-url show prune update"
 +	local subcommands="add rename remove set-head set-branches set-url show prune update"
  	local subcommand="$(__git_find_on_cmdline "$subcommands")"
  	if [ -z "$subcommand" ]; then
  		__gitcomp "$subcommands"
@@@ -2044,7 -2041,7 +2045,7 @@@
  	fi
  
  	case "$subcommand" in
 -	rename|rm|set-url|show|prune)
 +	rename|remove|set-url|show|prune)
  		__gitcomp_nl "$(__git_remotes)"
  		;;
  	set-head|set-branches)