git, branch v2.1.0-rc1

Git 2.1.0-rc1

2014-08-04T21:05:06Z

Signed-off-by: Junio C Hamano

Merge branch 'tf/maint-doc-push'

2014-08-04T21:03:45Z

* tf/maint-doc-push: git-push: fix link in man page

Merge branch 'ta/doc-config'

2014-08-04T21:03:25Z

* ta/doc-config: add documentation for writing config files

git-push: fix link in man page

2014-07-31T17:17:37Z

Signed-off-by: Tony Finch Signed-off-by: Junio C Hamano

Sync with 2.0.4

2014-07-30T21:25:46Z

* maint: Git 2.0.4 commit --amend: test specifies authorship but forgets to check

Update draft release notes to 2.1

2014-07-30T21:25:14Z

Signed-off-by: Junio C Hamano

Merge branch 'jk/more-push-completion'

2014-07-30T21:21:14Z

* jk/more-push-completion: completion: complete `git push --force-with-lease=` completion: add some missing options to `git push` completion: complete "unstuck" `git push --recurse-submodules`

Merge branch 'sk/mingw-tests-workaround'

2014-07-30T21:21:12Z

Make tests pass on msysgit by mostly disabling ones that are infeasible on that platform. * sk/mingw-tests-workaround: t800[12]: work around MSys limitation t9902: mingw-specific fix for gitfile link files t4210: skip command-line encoding tests on mingw MinGW: disable legacy encoding tests t0110/MinGW: skip tests that pass arbitrary bytes on the command line MinGW: Skip test redirecting to fd 4

Merge branch 'sk/mingw-uni-fix-more'

2014-07-30T21:21:09Z

Most of these are battle-tested in msysgit and are needed to complete what has been merged to 'master' already. * sk/mingw-uni-fix-more: Win32: enable color output in Windows cmd.exe Win32: patch Windows environment on startup Win32: keep the environment sorted Win32: use low-level memory allocation during initialization Win32: reduce environment array reallocations Win32: don't copy the environment twice when spawning child processes Win32: factor out environment block creation Win32: unify environment function names Win32: unify environment case-sensitivity Win32: fix environment memory leaks Win32: Unicode environment (incoming) Win32: Unicode environment (outgoing) Revert "Windows: teach getenv to do a case-sensitive search" tests: do not pass iso8859-1 encoded parameter

Merge branch 'ep/avoid-test-a-o'

2014-07-30T21:21:05Z

* ep/avoid-test-a-o: t9814: fix misconversion from test $a -o $b to test $a || test $b