git/contrib/completion/git-completion.bash, branch v2.16.2

Merge branch 'ac/complete-pull-autostash'

2017-12-06T17:23:37Z

The shell completion (in contrib/) learned that "git pull" can take the "--autostash" option. * ac/complete-pull-autostash: completion: add --autostash and --no-autostash to pull

Merge branch 'tz/complete-branch-copy'

2017-11-27T02:06:37Z

Command line completion (in contrib/) has been taught about the "--copy" option of "git branch". * tz/complete-branch-copy: completion: add '--copy' option to 'git branch'

Merge branch 'rv/sendemail-tocmd-in-config-and-completion'

2017-11-27T02:06:32Z

Teach "sendemail.tocmd" to places that know about "sendemail.to", like documentation and shell completion (in contrib/). * rv/sendemail-tocmd-in-config-and-completion: completion: add git config sendemail.tocmd Documentation/config: add sendemail.tocmd to list preceding "See git-send-email(1)"

Merge branch 'jc/ignore-cr-at-eol'

2017-11-27T02:06:31Z

The "diff" family of commands learned to ignore differences in carriage return at the end of line. * jc/ignore-cr-at-eol: diff: --ignore-cr-at-eol xdiff: reassign xpparm_t.flags bits

completion: add --autostash and --no-autostash to pull

2017-11-22T07:31:43Z

Ideally we should only autocomplete if pull has --rebase since they only work with it but could not figure out how to do that and the error message of doing git pull --autostash points out that you need --rebase so i guess it's good enough Signed-off-by: Albert Astals Cid Signed-off-by: Junio C Hamano

completion: add '--copy' option to 'git branch'

2017-11-17T01:32:19Z

In 52d59cc645 (branch: add a --copy (-c) option to go with --move (-m), 2017-06-18), `git branch` learned a `--copy` option. Include it when providing command completions. Signed-off-by: Todd Zullinger Signed-off-by: Junio C Hamano

Merge branch 'tz/fsf-address-update'

2017-11-15T03:14:34Z

* tz/fsf-address-update: Replace Free Software Foundation address in license notices Replace Free Software Foundation address in license notices

completion: add git config sendemail.tocmd

2017-11-14T06:42:01Z

Signed-off-by: Rasmus Villemoes Signed-off-by: Junio C Hamano

Replace Free Software Foundation address in license notices

2017-11-09T04:21:21Z

The mailing address for the FSF has changed over the years. Rather than updating the address across all files, refer readers to gnu.org, as the GNU GPL documentation now suggests for license notices. The mailing address is retained in the full license files (COPYING and LGPL-2.1). The old address is still present in t/diff-lib/COPYING. This is intentional, as the file is used in tests and the contents are not expected to change. Signed-off-by: Todd Zullinger Signed-off-by: Junio C Hamano

diff: --ignore-cr-at-eol

2017-11-08T01:05:27Z

A new option --ignore-cr-at-eol tells the diff machinery to treat a carriage-return at the end of a (complete) line as if it does not exist. Just like other "--ignore-*" options to ignore various kinds of whitespace differences, this will help reviewing the real changes you made without getting distracted by spurious CRLF<->LF conversion made by your editor program. Helped-by: Johannes Schindelin [jch: squashed in command line completion by Dscho] Signed-off-by: Junio C Hamano