Skip to content
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

Improve ergonomics for non-expert users #17

Merged
merged 3 commits into from
Jul 14, 2019

Conversation

nickolay
Copy link
Contributor

Don't stop quietly when we do nothing, instead print a message with suggestions on what the user can do.

Seemed out-of-place in the main routine, which is complex as it is.
- Print "Please use --base to specify the base commit." when all the
  commits were "hidden" by other branches. (This makes the misbehavior
  described in tummychow#9 less confusing.)

- Instead of noting that "merge commit found", explain what it means to
  the user: "Will not fix up past the merge commit".

- Provide suggestions when "stack limit reached": "use --base or
  configure absorb.maxStack to override"

  - Don't honor absorb.maxStack with explicit --base

- Note if the stack is empty: "No commits available to fix up, exiting"

- Warn if "No additions staged, try adding something to the index."

- Print "Could not find a commit to fix up, use --base to increase the
  search range." instead of "could not find noncommutative commit", and
  display this message by default (without the verbose mode)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants