git, branch v2.0.0-rc3

Git 2.0-rc3

2014-05-09T18:23:55Z

Sync with 1.9.3

2014-05-09T18:00:48Z

Git 1.9.3

2014-05-09T17:59:07Z

The third maintenance release for Git 1.9; contains all the fixes that are scheduled to appear in Git 2.0 since 1.9.2. Signed-off-by: Junio C Hamano

Sync with maint

2014-05-08T18:59:51Z

* maint: shell doc: remove stray "+" in example Start preparing for 1.9.3

shell doc: remove stray "+" in example

2014-05-08T17:26:26Z

The git-shell(1) manpage says EXAMPLE To disable interactive logins, displaying a greeting instead: + $ chsh -s /usr/bin/git-shell $ mkdir $HOME/git-shell-commands [...] The stray "+" has been there ever since the example was added in v1.8.3-rc0~210^2 (shell: new no-interactive-login command to print a custom message, 2013-03-09). The "+" sign between paragraphs is needed in asciidoc to attach extra paragraphs to a list item but here it is not needed and ends up rendered as a literal "+". Remove it. A quick search with "grep -e '

+' /usr/share/doc/git/html/*.html" doesn't find any other instances of this problem. Signed-off-by: Jonathan Nieder Signed-off-by: Junio C Hamano

Merge git://github.com/git-l10n/git-po

2014-05-08T17:25:37Z

* 'master' of git://github.com/git-l10n/git-po: l10n: Fix a couple of typos in the Swedish translation

Start preparing for 1.9.3

2014-05-08T17:05:22Z

Signed-off-by: Junio C Hamano

Merge branch 'cl/p4-use-diff-tree' into maint

2014-05-08T17:01:32Z

"git p4" dealing with changes in binary files were broken by a change in 1.9 release. * cl/p4-use-diff-tree: git-p4: format-patch to diff-tree change breaks binary patches

Merge branch 'rh/prompt-pcmode-avoid-eval-on-refname' into maint

2014-05-08T17:01:18Z

The shell prompt script (in contrib/), when using the PROMPT_COMMAND interface, used an unsafe construct when showing the branch name in $PS1. * rh/prompt-pcmode-avoid-eval-on-refname: git-prompt.sh: don't put unsanitized branch names in $PS1

Merge branch 'km/avoid-non-function-return-in-rebase' into maint

2014-05-08T17:01:06Z

"git rebase" used a POSIX shell construct FreeBSD /bin/sh does not work well with. * km/avoid-non-function-return-in-rebase: Revert "rebase: fix run_specific_rebase's use of "return" on FreeBSD" rebase: avoid non-function use of "return" on FreeBSD