* maint:
  Revert "core.abbrevguard: Ensure short object names stay unique a bit longer"

This reverts commit 72a5b561, as adding
fixed number of hexdigits more than necessary to make one object name
locally unique does not help in futureproofing the uniqueness of names
we generate today.
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

Signed-off-by: NJunio C Hamano <gitster@pobox.com>

* js/cherry-pick-usability:
  Teach commit about CHERRY_PICK_HEAD
  bash: teach __git_ps1 about CHERRY_PICK_HEAD
  Introduce CHERRY_PICK_HEAD
  t3507: introduce pristine-detach helper

* js/checkout-untracked-symlink:
  do not overwrite untracked symlinks
  Demonstrate breakage: checkout overwrites untracked symlink with directory

* so/submodule-no-update-first-time:
  t7406: "git submodule update {--merge|--rebase]" with new submodules
  submodule: no [--merge|--rebase] when newly cloned

* maint:
  Fix typo in t/README
  ls-remote documentation: <refs> argument is optional
  Add Author and Documentation sections to git-for-each-ref.txt
  Documentation: remove redundant colons in git-for-each-ref.txt

Signed-off-by: NMathias Lafeldt <misfire@debugon.org>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

Correct SYNOPSIS section.
Signed-off-by: NPiotr Krukowiecki <piotr.krukowiecki@gmail.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

Signed-off-by: NAlexei Sholik <alcosholik@gmail.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

Signed-off-by: NAlexei Sholik <alcosholik@gmail.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

* maint:
  SubmittingPatches: clarify the expected commit log description
  diff format documentation: clarify --cc and -c
  rev-list-options.txt: typo fix

'bytes' is of type size_t which is unsigned thus can't be negative.  But
the assigned write() returns ssize_t, and -1 on error.

For testing < 0, 'bytes' needs to be of a signed type.
Signed-off-by: NNicolas Kaiser <nikai@nikai.net>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

Earlier, 47afed5d (SubmittingPatches: itemize and reflect upon well written
changes, 2009-04-28) added a discussion on the contents of the commit log
message, but the last part of the new paragraph didn't make much sense.
Reword it slightly to make it more readable.

Update the "quicklist" to clarify what we mean by "motivation" and
"contrast".  Also mildly discourage external references.
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

The description was unclear if -c or --cc was the default (--cc is for
some commands), and incorrectly implied that the default applies to
all the diff generating commands.

Most importantly, "log" does not default to "--cc" (it defaults to
"--no-merges") and "log -p" obeys the user's wish to see non-combined
format.  Only "diff" (during merge and three-blob comparison) and
"show" use --cc as the default.
Signed-off-by: NAdam Monsen <haircut@gmail.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

Signed-off-by: NMichael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

* maint:
  Documentation: fix a typo in git-apply.txt
  init: remove unnecessary check

* mh/p4:
  git-p4 submit: prevent 'Jobs' section from being removed from p4 change log

* mg/maint-difftool-vim-readonly:
  mergetool-lib: call vim in readonly mode for diffs

* jn/maint-commit-missing-template:
  commit: error out for missing commit message template

* jk/diffstat-binary:
  diff: don't retrieve binary blobs for diffstat
  diff: handle diffstat of rewritten binary files

* lt/rename-no-extra-copy-detection:
  diffcore-rename: improve estimate_similarity() heuristics
  diffcore-rename: properly honor the difference between -M and -C
  for_each_hash: allow passing a 'void *data' pointer to callback

* jn/test-terminal-punt-on-osx-breakage:
  tests: skip terminal output tests on OS X

* jk/fail-null-clone:
  clone: die when trying to clone missing local path

* jc/grep--no-index-pathspec-fix:
  grep --no-index: honor pathspecs correctly

git-apply accepts the --cached option, not --cache.
Signed-off-by: NMichał Kiedrowicz <michal.kiedrowicz@gmail.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

git_dir must always be non-NULL so "if (git_dir)" is unnecessary.
Before this code, if git_dir == NULL, it will default to
DEFAULT_GIT_DIR_ENVIRONMENT.
Signed-off-by: NNguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

* maint:
  verify-pack: add --stat-only to the synopsis section

Signed-off-by: NJunio C Hamano <gitster@pobox.com>

* 'svn-fe' of git://repo.or.cz/git/jrn: (31 commits)
  fast-import: make code "-Wpointer-arith" clean
  vcs-svn: teach line_buffer about temporary files
  vcs-svn: allow input from file descriptor
  vcs-svn: allow character-oriented input
  vcs-svn: add binary-safe read function
  t0081 (line-buffer): add buffering tests
  vcs-svn: tweak test-line-buffer to not assume line-oriented input
  tests: give vcs-svn/line_buffer its own test script
  vcs-svn: make test-line-buffer input format more flexible
  vcs-svn: teach line_buffer to handle multiple input files
  vcs-svn: collect line_buffer data in a struct
  vcs-svn: replace buffer_read_string memory pool with a strbuf
  vcs-svn: eliminate global byte_buffer
  fast-import: add 'ls' command
  vcs-svn: Allow change nodes for root of tree (/)
  vcs-svn: Implement Prop-delta handling
  vcs-svn: Sharpen parsing of property lines
  vcs-svn: Split off function for handling of individual properties
  vcs-svn: Make source easier to read on small screens
  vcs-svn: More dump format sanity checks
  ...

The dereference() function to peel a tree-ish and find the underlying
tree expects arithmetic to (void *) to work on byte addresses.  We
should be reading the text of objects through a char * anyway.
Noticed-by: NJunio C Hamano <gitster@pobox.com>
Signed-off-by: NJonathan Nieder <jrnieder@gmail.com>

Signed-off-by: NJunio C Hamano <gitster@pobox.com>

* jh/push-default-upstream-configname:
  push.default: Rename 'tracking' to 'upstream'

* lp/config-vername-check:
  Disallow empty section and variable names
  Sanity-check config variable names

* mg/placeholders-are-lowercase:
  Make <identifier> lowercase in Documentation
  Make <identifier> lowercase as per CodingGuidelines
  Make <identifier> lowercase as per CodingGuidelines
  Make <identifier> lowercase as per CodingGuidelines
  CodingGuidelines: downcase placeholders in usage messages

* mg/patch-id:
  git-patch-id: do not trip over "no newline" markers
  git-patch-id: test for "no newline" markers

* mz/rerere-remaining:
  mergetool: don't skip modify/remove conflicts
  rerere "remaining"

* nd/sorted-builtin-command-list:
  git.c: reorder builtin command list

* js/maint-merge-use-prepare-commit-msg-hook:
  merge: honor prepare-commit-msg hook

* nd/hash-object-sanity:
  Make hash-object more robust against malformed objects

Conflicts:
	cache.h