GitHub user hsaputra opened a pull request:
https://github.com/apache/flink/pull/548
Add --abbrev-ref to get the right branch name of HEAD
Add --abbrev-ref to get the right branch name of HEAD rather than checksum
to return back to original branch.
Without it will make merge tool to go to unnamed branch.
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/hsaputra/flink
fix_merge_tools_to_get_original_head
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/flink/pull/548.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #548
----
commit c3d025a4531ed0528131f27caa04732f6fb9238c
Author: Henry Saputra <henry.sapu...@gmail.com>
Date: 2015-03-31T00:06:36Z
Add --abbrev-ref to get the right branch name of HEAD rather than checksum
to return back to original branch.
----
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
