git, branch v2.1.0-rc0

Git 2.1.0-rc0

2014-07-27T22:22:22Z

Signed-off-by: Junio C Hamano

Merge branch 'jk/rebase-am-fork-point'

2014-07-27T22:14:21Z

"git rebase --fork-point" did not filter out patch-identical commits correctly. * jk/rebase-am-fork-point: rebase: omit patch-identical commits with --fork-point rebase--am: use --cherry-pick instead of --ignore-if-in-upstream

Merge branch 'cc/replace-graft'

2014-07-27T22:14:18Z

"git replace" learned a "--graft" option to rewrite parents of a commit. * cc/replace-graft: replace: add test for --graft with a mergetag replace: check mergetags when using --graft replace: add test for --graft with signed commit replace: remove signature when using --graft contrib: add convert-grafts-to-replace-refs.sh Documentation: replace: add --graft option replace: add test for --graft replace: add --graft option replace: cleanup redirection style in tests

Merge branch 'jk/stable-prio-queue'

2014-07-27T22:14:15Z

* jk/stable-prio-queue: t5539: update a flaky test paint_down_to_common: use prio_queue prio-queue: make output stable with respect to insertion prio-queue: factor out compare and swap operations

Sync with v2.0.3

2014-07-23T18:36:40Z

* maint: Git 2.0.3 .mailmap: combine Stefan Beller's emails git.1: switch homepage for stats

Merge branch 'rs/fix-unlink-unix-socket'

2014-07-23T18:36:00Z

The unix-domain socket used by the sample credential cache daemon tried to unlink an existing stale one at a wrong path, if the path to the socket was given as an overlong path that does not fit in sun_path member of the sockaddr_un structure. * rs/fix-unlink-unix-socket: unix-socket: remove stale socket before calling chdir()

Merge branch 'ta/string-list-init'

2014-07-23T18:35:54Z

* ta/string-list-init: replace memset with string-list initializers string-list: add string_list initializer helper function

Merge branch 'mb/local-clone-after-applying-insteadof'

2014-07-23T18:35:49Z

Apply the "if cloning from a local disk, physically copy repository using hardlinks, unless otherwise told not to with --no-local" optimization when url.*.insteadOf mechanism rewrites a "git clone $URL" that refers to a repository over the network to a clone from a local disk. * mb/local-clone-after-applying-insteadof: use local cloning if insteadOf makes a local URL

Merge branch 'jk/tag-sort'

2014-07-23T18:35:45Z

* jk/tag-sort: tag: support configuring --sort via .gitconfig tag: fix --sort tests to use cat<<-\EOF format

Git 2.0.3

2014-07-23T18:33:16Z

Signed-off-by: Junio C Hamano