git, branch v2.3.0-rc1

Git 2.3.0-rc1

2015-01-21T01:35:41Z

Signed-off-by: Junio C Hamano

Merge branch 'jk/http-push-symref-fix'

2015-01-21T01:31:50Z

* jk/http-push-symref-fix: http-push: trim trailing newline from remote symref

Merge branch 'ak/show-branch-usage-string'

2015-01-21T00:16:09Z

* ak/show-branch-usage-string: show-branch: fix indentation of usage string

show-branch: fix indentation of usage string

2015-01-21T00:12:54Z

Noticed-by: Jean-Noël Avila Signed-off-by: Ralf Thielow Signed-off-by: Junio C Hamano

Merge branch 'jk/colors'

2015-01-20T23:57:22Z

* jk/colors: parse_color: fix return value for numeric color values 0-8

parse_color: fix return value for numeric color values 0-8

2015-01-20T23:56:03Z

When commit 695d95d refactored the color parsing, it missed a "return 0" when parsing literal numbers 0-8 (which represent basic ANSI colors), leading us to report these colors as an error. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

git-svn: make it play nicely with submodules

2015-01-15T08:35:55Z

It's a simple matter of opening the directory specified in the gitfile. [ew: tweaked check to avoid open() on directories] Signed-off-by: Ramkumar Ramachandra Signed-off-by: Eric Wong

Git::SVN: handle missing ref_id case correctly

2015-01-15T08:35:55Z

ref_id should not match "refs/remotes/". [ew: dropped initial hunk for GIT_SVN_ID at Ramkumar's request] Signed-off-by: Ramkumar Ramachandra Signed-off-by: Eric Wong

Fifth batch for 2.3 cycle

2015-01-14T20:44:03Z

Hopefully this will be the final feature update for 2.3-rc1 Signed-off-by: Junio C Hamano

Merge branch 'po/doc-core-ignorestat'

2015-01-14T20:41:38Z

* po/doc-core-ignorestat: doc: core.ignoreStat update, and clarify the --assume-unchanged effect doc: core.ignoreStat clarify the --assume-unchanged effect