docs: Explain the purpose of fetch's and pull's <refspec> parameter.

Signed-off-by: Marc Branchaud <marcnarc@xiplink.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
pull: do not abuse 'break' inside a shell 'case'

It is not C. The code would break under mksh when 'pull.ff' is set:

  $ git pull
  /usr/lib/git-core/git-pull[67]: break: can't break
  Already up-to-date.

Signed-off-by: Jacek Konieczny <jajcus@jajcus.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Merge branch 'jc/rev-parse-argh-dashed-multi-words' into maint

* jc/rev-parse-argh-dashed-multi-words:
  update-index: fix segfault with missing --cacheinfo argument
Sync with maint

* maint:
  pull: do not abuse 'break' inside a shell 'case'
t7700: drop explicit --no-pack-kept-objects from .keep test

We want to make sure that the default behavior of git-repack,
without any options, continues to treat .keep files as it
always has. Adding an explicit --no-pack-kept-objects, as
ee34a2b did, is a much less interesting test, and prevented
us from noticing the bug fixed by 64d3dc9 (repack: do not
accidentally pack kept objects by default, 2014-06-10).

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Merge branch 'mt/patch-id-stable' (early part) into jch

* 'mt/patch-id-stable' (early part):
  patch-id-test: test stable and unstable behaviour
  patch-id: make it stable against hunk reordering
  test doc: test_write_lines does not split its arguments
  test: add test_write_lines helper
Merge branch 'cc/replace-edit' into jch

"git replace" learns a new "--edit" option.

* cc/replace-edit:
  Documentation: replace: describe new --edit option
  replace: add --edit to usage string
  replace: add tests for --edit
  replace: die early if replace ref already exists
  replace: refactor checking ref validity
  replace: make sure --edit results in a different object
  replace: add --edit option
  replace: factor object resolution out of replace_object
  replace: use OPT_CMDMODE to handle modes
  replace: refactor command-mode determination
Merge branch 'jk/do-not-run-httpd-tests-as-root' into jch

* jk/do-not-run-httpd-tests-as-root:
  t/lib-httpd: require SANITY prereq
Merge branch 'sk/wincred' into jch

* sk/wincred:
  wincred: avoid overwriting configured variables
  wincred: add install target
Merge branch 'jk/argv-array-for-child-process' into jch

* jk/argv-array-for-child-process:
  argv-array: drop "detach" code
  get_importer: use run-command's internal argv_array
  get_exporter: use argv_array
  get_helper: use run-command's internal argv_array
  git_connect: use argv_array
  run_column_filter: use argv_array
  run-command: store an optional argv_array
Merge branch 'jk/diff-files-assume-unchanged' into jch

* jk/diff-files-assume-unchanged:
  run_diff_files: do not look at uninitialized stat data
Merge branch 'jk/report-fail-to-read-objects-better' into jch

* jk/report-fail-to-read-objects-better:
  open_sha1_file: report "most interesting" errno
Merge branch 'rr/rebase-autostash-fix' into jch

* rr/rebase-autostash-fix:
  rebase -i: test "Nothing to do" case with autostash
  rebase -i: handle "Nothing to do" case with autostash
Merge branch 'sk/windows-unc-path' into jch

* sk/windows-unc-path:
  Windows: allow using UNC path for git repository
Merge branch 'jk/diff-follow-must-take-one-pathspec' into jch

* jk/diff-follow-must-take-one-pathspec:
  move "--follow needs one pathspec" rule to diff_setup_done

# Conflicts:
# 	diff.c
Merge branch 'as/pretty-truncate' into jch

* as/pretty-truncate:
  pretty.c: format string with truncate respects logOutputEncoding
  t4205, t6006: add tests that fail with i18n.logOutputEncoding set
  t4205 (log-pretty-format): use `tformat` rather than `format`
  t4041, t4205, t6006, t7102: don't hardcode tested encoding value
  t4205 (log-pretty-formats): don't hardcode SHA-1 in expected outputs
Merge branch 'jk/daemon-tolower' into jch

* jk/daemon-tolower:
  daemon/config: factor out duplicate xstrdup_tolower
Merge branch 'jk/strbuf-tolower' into jch

* jk/strbuf-tolower:
  strbuf: add strbuf_tolower function

# Conflicts:
# 	Documentation/technical/api-strbuf.txt
Merge branch 'cb/byte-order' into jch

Compatibility enhancement for Solaris.

* cb/byte-order:
  compat/bswap.h: fix endianness detection
  compat/bswap.h: restore preference __BIG_ENDIAN over BIG_ENDIAN
  compat/bswap.h: detect endianness on more platforms that don't use BYTE_ORDER
Merge branch 'jl/status-added-submodule-is-never-ignored' into jch

submodule.*.ignore and diff.ignoresubmodules are used to ignore all
submodule changes in "diff" output, but it can be confusing to
apply these configuration values to status and commit.

This is a backward-incompatible change, but should be so in a good
way (aka bugfix).

* jl/status-added-submodule-is-never-ignored:
  commit -m: commit staged submodules regardless of ignore config
  status/commit: show staged submodules regardless of ignore config