-
Notifications
You must be signed in to change notification settings - Fork 143
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[1.0.0.rc1] man: add tty option and tfix #162
Conversation
…an-page Makefile: clean up compiled man page
Use Generator pointers as methods receivers
…remove-unusefule-default-value generate: remove unuseful default value for output
…-to-validate move defaultCaps to validate
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
I see 5 commits including 4 merge commits. Is that intentional? |
On Thu, Jul 28, 2016 at 04:04:28PM -0700, Mrunal Patel wrote:
562e912 was behind #140 landing: $ git log --graph --oneline --decorate f0ecc98 | head -n6
so I just PRed it directly without cherry-picking. The only thing we |
On Thu, Jul 28, 2016 at 04:15:30PM -0700, W. Trevor King wrote:
And that would be easier to see if the graph actually included 562e912 $ git log --graph --oneline --decorate f0ecc98 562e912 | head -n6
So 562e912 is based on the last master commit before #140 landed. |
Anything I can to do help move this along? GitHub says there are
conflicts, but this applies cleanly if I merge locally:
$ git checkout v1.0.0.rc1
Switched to branch 'v1.0.0.rc1'
Your branch is up-to-date with 'origin/v1.0.0.rc1'.
$ git merge man-add-tty-and-tfix
Auto-merging man/oci-runtime-tool-generate.1.md
Auto-merging cmd/oci-runtime-tool/generate.go
Merge made by the 'recursive' strategy.
cmd/oci-runtime-tool/generate.go | 6 +++---
man/oci-runtime-tool-generate.1.md | 5 ++++-
2 files changed, 7 insertions(+), 4 deletions(-)
|
I think your branch man-add-tty-and-tfix may checkout from wrong branch. you may need create a new man-add-tty-and-tfix branch again and push PR again. |
On Wed, Sep 28, 2016 at 01:22:13AM -0700, Ma Shimiao wrote:
562e912 (originally submitted as #154) branched off of master before |
anyway, 4 merge commits is not expected. Maybe reset would make any sense? |
On Thu, Sep 29, 2016 at 01:48:08AM -0700, Ma Shimiao wrote:
Am I just explaining it poorly? Or does the explanation make sense I think this would be a lot less work if we just focused new PRs on a |
Backporting #154 to v1.0.0.rc1 following the first procedure here.