Skip to content

refresh: Support --diff with --edit #99

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

Merged
merged 1 commit into from
Mar 30, 2021
Merged

refresh: Support --diff with --edit #99

merged 1 commit into from
Mar 30, 2021

Conversation

abhinav
Copy link
Contributor

@abhinav abhinav commented Mar 19, 2021

Add a --diff flag to stg refresh that, when used with --edit, is
equivalent to stg edit --diff.

Resolves #98

Add a `--diff` flag to `stg refresh` that, when used with `--edit`, is
equivalent to `stg edit --diff`.

Resolves #98
@jpgrayson
Copy link
Collaborator

Want to say thanks for this PR, @abhinav, and sorry I have not yet had time to look at it. I will try to get to it soon.

@jpgrayson jpgrayson merged commit 34b5882 into stacked-git:master Mar 30, 2021
@jpgrayson
Copy link
Collaborator

Merged. I appreciate this PR, @abhinav.

That said, I have mixed feelings about blessing refresh --edit --diff with the same behavior as edit --diff. I agree that viewing the diff inline while editing commit messages is very helpful. BUT, on the other hand, editing diffs along with the commit message is fragile and I consider it an anti-feature of StGit. I have been considering removing the inline diff editing capability. I'm interested in whether anyone relies on this feature in their workflow; and if so, why?

@abhinav abhinav deleted the refresh-diff branch March 30, 2021 03:45
@abhinav
Copy link
Contributor Author

abhinav commented Mar 30, 2021

Thanks, @jpgrayson. Yeah, diff editing was a surprising feature. I use this flag to view, not change. Removal of editing makes sense to me if nobody relies on it heavily.

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.

refresh: Support --diff with --edit
2 participants