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

Merge branch 'sg/completion-remote' into maint

2015-03-23T18:23:33Z

Code simplification. * sg/completion-remote: completion: simplify __git_remotes() completion: add a test for __git_remotes() helper function

config,completion: add color.status.unmerged

2015-03-10T22:27:59Z

Reported-by: "Mladen B." Signed-off-by: Michael J Gruber Signed-off-by: Junio C Hamano

completion: simplify __git_remotes()

2015-03-06T20:48:02Z

The __git_remotes() helper function lists the remotes from the config file by processing the output of a 'git config' query. A simple 'git remote' produces the exact same output, so run that instead. Remotes under '$GIT_DIR/remotes' are still listed by running 'ls -1', because 'git remote' unfortunately ignores them. Signed-off-by: SZEDER Gábor Signed-off-by: Junio C Hamano

Merge branch 'mm/complete-rebase-autostash'

2015-01-14T20:33:57Z

* mm/complete-rebase-autostash: git-completion: add --autostash for 'git rebase'

Merge branch 'pd/completion-filenames-fix'

2015-01-07T21:06:37Z

The top-of-the-file instruction for completion scripts (in contrib/) did not name the files correctly. * pd/completion-filenames-fix: Update documentation occurrences of filename .sh

git-completion: add --autostash for 'git rebase'

2015-01-07T18:42:53Z

This option was added in 58794775 (rebase: implement --[no-]autostash and rebase.autostash, 2013-05-12). Completion of "--autosquash" has been there, but this was not; addition of this would require people completing "--autosquash" to type a bit more than before. Signed-off-by: Matthieu Moy Signed-off-by: Junio C Hamano

Merge branch 'rt/completion-tag'

2014-12-22T20:27:24Z

* rt/completion-tag: completion: add git-tag options

Update documentation occurrences of filename .sh

2014-12-15T17:37:14Z

Documentation in the completion scripts for Bash and Zsh state the wrong filenames. Signed-off-by: Peter van der Does Signed-off-by: Junio C Hamano

completion: add git-tag options

2014-12-04T20:10:26Z

Add completion for git-tag options including all options that are currently shown in "git tag -h". Signed-off-by: Ralf Thielow Signed-off-by: Junio C Hamano

git-send-email: add --transfer-encoding option

2014-11-25T22:00:15Z

The thread at http://thread.gmane.org/gmane.comp.version-control.git/257392 details problems when applying patches with "git am" in a repository with CRLF line endings. In the example in the thread, the repository originated from "git-svn" so it is not possible to use core.eol and friends on it. Right now, the best option is to use "git am --keep-cr". However, when a patch create new files, the patch application process will reject the new file because it finds a "/dev/null\r" string instead of "/dev/null". The problem is that SMTP transport is CRLF-unsafe. Sending a patch by email is the same as passing it through "dos2unix | unix2dos". The newly introduced CRLFs are normally transparent because git-am strips them. The keepcr=true setting preserves them, but it is mostly working by chance and it would be very problematic to have a "git am" workflow in a repository with mixed LF and CRLF line endings. The MIME solution to this is the quoted-printable transfer enconding. This is not something that we want to enable by default, since it makes received emails horrible to look at. However, it is a very good match for projects that store CRLF line endings in the repository. The only disadvantage of quoted-printable is that quoted-printable patches fail to apply if the maintainer uses "git am --keep-cr". This is because the decoded patch will have two carriage returns at the end of the line. Therefore, add support for base64 transfer encoding too, which makes received emails downright impossible to look at outside a MUA, but really just works. The patch covers all bases, including users that still live in the late 80s, by also providing a 7bit content transfer encoding that refuses to send emails with non-ASCII character in them. And finally, "8bit" will add a Content-Transfer-Encoding header but otherwise do nothing. Signed-off-by: Paolo Bonzini Signed-off-by: Junio C Hamano