Merge branch 'maint'

* maint:
git-diff: fix combined diff
Fix 'git commit -a' in a newly initialized repository
Include git-gui credits file in dist.
Document the new core.bare configuration option.

diff --combined Documentation/config.txt
index f5c846f4101c3d83ac6604b1f8b20925fde82857,4a22a00b71d089f96603779324f71df774b3f1a6..9d045d88327e8f949f61f2f8e776e4ad44789ca0
--- 1/Documentation/config.txt
--- 2/Documentation/config.txt
+++ b/Documentation/config.txt
@@@ -142,6 -142,18 +142,18 @@@ core.preferSymlinkRefs:
        This is sometimes needed to work with old scripts that
        expect HEAD to be a symbolic link.
  
+ core.bare::
+       If true this repository is assumed to be 'bare' and has no
+       working directory associated with it.  If this is the case a
+       number of commands that require a working directory will be
+       disabled, such as gitlink:git-add[1] or gitlink:git-merge[1].
+ +
+ This setting is automatically guessed by gitlink:git-clone[1] or
+ gitlink:git-init[1] when the repository was created.  By default a
+ repository that ends in "/.git" is assumed to be not bare (bare =
+ false), while all other repositories are assumed to be bare (bare
+ = true).
+ 
  core.logAllRefUpdates::
        Updates to a ref <ref> is logged to the file
        "$GIT_DIR/logs/<ref>", by appending the new and old
@@@ -451,10 -463,6 +463,10 @@@ remote.<name>.push:
        The default set of "refspec" for gitlink:git-push[1]. See
        gitlink:git-push[1].
  
 +remote.<name>.skipDefaultUpdate::
 +      If true, this remote will be skipped by default when updating
 +      using the remote subcommand of gitlink:git-remote[1].
 +
  remote.<name>.receivepack::
        The default program to execute on the remote side when pushing.  See
        option \--exec of gitlink:git-push[1].
@@@ -463,10 -471,6 +475,10 @@@ remote.<name>.uploadpack:
        The default program to execute on the remote side when fetching.  See
        option \--exec of gitlink:git-fetch-pack[1].
  
 +remotes.<group>::
 +      The list of remotes which are fetched by "git remote update
 +      <group>".  See gitlink:git-remote[1].
 +
  repack.usedeltabaseoffset::
        Allow gitlink:git-repack[1] to create packs that uses
        delta-base offset.  Defaults to false.

diff --combined Makefile
index 289decddc8865143896ff10fc3248ae460ef0b30,64d29f7c1852ccf4b531e6cfca5ad215377d555c..35be5e20496fe072c473639a00ebcaf77cda22f3
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -176,7 -176,7 +176,7 @@@ SCRIPT_SH = 
        git-merge-one-file.sh git-parse-remote.sh \
        git-pull.sh git-rebase.sh \
        git-repack.sh git-request-pull.sh git-reset.sh \
 -      git-resolve.sh git-revert.sh git-sh-setup.sh \
 +      git-revert.sh git-sh-setup.sh \
        git-tag.sh git-verify-tag.sh \
        git-applymbox.sh git-applypatch.sh git-am.sh \
        git-merge.sh git-merge-stupid.sh git-merge-octopus.sh \
@@@ -284,6 -284,7 +284,6 @@@ BUILTIN_OBJS = 
        builtin-diff.o \
        builtin-diff-files.o \
        builtin-diff-index.o \
 -      builtin-diff-stages.o \
        builtin-diff-tree.o \
        builtin-fmt-merge-msg.o \
        builtin-for-each-ref.o \
@@@ -295,7 -296,6 +295,7 @@@
        builtin-ls-tree.o \
        builtin-mailinfo.o \
        builtin-mailsplit.o \
 +      builtin-merge-base.o \
        builtin-merge-file.o \
        builtin-mv.o \
        builtin-name-rev.o \
@@@ -895,7 -895,8 +895,8 @@@ dist: git.spec git-archiv
        $(TAR) rf $(GIT_TARNAME).tar \
                $(GIT_TARNAME)/git.spec \
                $(GIT_TARNAME)/version \
-               $(GIT_TARNAME)/git-gui/version
+               $(GIT_TARNAME)/git-gui/version \
+               $(GIT_TARNAME)/git-gui/credits
        @rm -rf $(GIT_TARNAME)
        gzip -f -9 $(GIT_TARNAME).tar