git/Documentation, branch v2.4.7

Git 2.4.7

2015-07-27T19:25:42Z

Signed-off-by: Junio C Hamano

Merge branch 'jk/pretty-encoding-doc' into maint

2015-07-27T19:21:48Z

Doc update. * jk/pretty-encoding-doc: docs: clarify that --encoding can produce invalid sequences

Merge branch 'tb/checkout-doc' into maint

2015-07-27T19:21:47Z

Doc update. * tb/checkout-doc: git-checkout.txt: document "git checkout " better

Merge branch 'ls/hint-rev-list-count' into maint

2015-07-27T19:21:47Z

* ls/hint-rev-list-count: rev-list: add --count to usage guide

Merge branch 'mm/branch-doc-updates' into maint

2015-07-27T19:21:46Z

* mm/branch-doc-updates: Documentation/branch: document -M and -D in terms of --force Documentation/branch: document -d --force and -m --force

Git 2.4.6

2015-07-15T19:31:07Z

Signed-off-by: Junio C Hamano

Merge branch 'mm/describe-doc' into maint

2015-07-15T18:41:26Z

Docfix. * mm/describe-doc: Documentation/describe: improve one-line summary

Merge branch 'fk/doc-format-patch-vn' into maint

2015-07-15T18:41:22Z

Docfix. * fk/doc-format-patch-vn: doc: format-patch: fix typo

Documentation/branch: document -M and -D in terms of --force

2015-07-06T17:36:54Z

Now that we have proper documentation for --force's interaction with -d and -m, we can avoid duplication and consider -M and -D as convenience aliases for -m --force and -d --force. Signed-off-by: Matthieu Moy Signed-off-by: Junio C Hamano

Documentation/branch: document -d --force and -m --force

2015-07-06T17:36:51Z

The --force option was modified in 356e91f (branch: allow -f with -m and -d, 2014-12-08), but the documentation was not updated. Signed-off-by: Matthieu Moy Signed-off-by: Junio C Hamano