From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 7 Feb 2009 19:10:16 +0000 (-0800)
Subject: Merge branch 'tr/add-p-single'
X-Git-Tag: v1.6.2-rc0~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/c19923add0530567ff90e4c4e1bccbc5c0a837f7?ds=inline;hp=-c

Merge branch 'tr/add-p-single'

* tr/add-p-single:
add -p: import Term::ReadKey with 'require'
add -p: print errors in separate color
add -p: prompt for single characters
---

c19923add0530567ff90e4c4e1bccbc5c0a837f7
diff --combined Documentation/config.txt
index 7fbf64d24c,1806a60610..1dd18c928d
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@@ -422,19 -422,6 +422,19 @@@ relatively high IO latencies.  With thi
  index comparison to the filesystem data in parallel, allowing
  overlapping IO's.
  
 +core.notesRef::
 +	When showing commit messages, also show notes which are stored in
 +	the given ref.  This ref is expected to contain files named
 +	after the full SHA-1 of the commit they annotate.
 ++
 +If such a file exists in the given ref, the referenced blob is read, and
 +appended to the commit message, separated by a "Notes:" line.  If the
 +given ref itself does not exist, it is not an error, but means that no
 +notes should be printed.
 ++
 +This setting defaults to "refs/notes/commits", and can be overridden by
 +the `GIT_NOTES_REF` environment variable.
 +
  alias.*::
  	Command aliases for the linkgit:git[1] command wrapper - e.g.
  	after defining "alias.last = cat-file commit HEAD", the invocation
@@@ -569,8 -556,8 +569,8 @@@ color.interactive:
  
  color.interactive.<slot>::
  	Use customized color for 'git-add --interactive'
- 	output. `<slot>` may be `prompt`, `header`, or `help`, for
- 	three distinct types of normal output from interactive
+ 	output. `<slot>` may be `prompt`, `header`, `help` or `error`, for
+ 	four distinct types of normal output from interactive
  	programs.  The values of these variables may be specified as
  	in color.branch.<slot>.
  
@@@ -1013,6 -1000,13 +1013,13 @@@ instaweb.port:
  	The port number to bind the gitweb httpd to. See
  	linkgit:git-instaweb[1].
  
+ interactive.singlekey::
+ 	In interactive programs, allow the user to provide one-letter
+ 	input with a single key (i.e., without hitting enter).
+ 	Currently this is used only by the `\--patch` mode of
+ 	linkgit:git-add[1].  Note that this setting is silently
+ 	ignored if portable keystroke input is not available.
+ 
  log.date::
  	Set default date-time mode for the log command. Setting log.date
  	value is similar to using 'git-log'\'s --date option. The value is one of the