GitHub user hsaputra opened a pull request:
https://github.com/apache/flink/pull/552
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.
Somehow old PR #548 could not be reopen so submit new one. Sorry
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/552.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 #552
----
commit fb66cef51a806ee9d21afa92d6e935dde0ada2e0
Author: Henry Saputra <[email protected]>
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.
commit 35350f223a68542cfd1bfe5f1c07908058d4750b
Author: Henry Saputra <[email protected]>
Date: 2015-03-31T17:53:42Z
Remove trailing newline in original branch name.
----
---
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 [email protected] or file a JIRA ticket
with INFRA.
---
