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

Add a command revup commit #52

Merged

Conversation

malcolm-leclair-skydio
Copy link
Contributor

@malcolm-leclair-skydio malcolm-leclair-skydio commented Sep 20, 2022

This command is an alias to "revup amend --insert"

Topic: revup_commit

@malcolm-leclair-skydio
Copy link
Contributor Author

malcolm-leclair-skydio commented Sep 20, 2022

Reviews in this chain:
#52 Add a command revup commit

@malcolm-leclair-skydio
Copy link
Contributor Author

malcolm-leclair-skydio commented Sep 20, 2022

# head base diff date summary
0 53b036bd 1ec4bcaa diff Sep 20 12:46 PM 1 file changed, 22 insertions(+), 11 deletions(-)
1 9d78f196 1ec4bcaa diff Sep 20 1:27 PM 1 file changed, 10 insertions(+), 12 deletions(-)
2 fd53d70c 1ec4bcaa diff Sep 20 2:44 PM 2 files changed, 5 insertions(+), 8 deletions(-)
3 77e26d6d 1ec4bcaa diff Sep 20 3:02 PM 0 files changed
4 4e646092 1ec4bcaa diff Sep 20 4:33 PM 0 files changed

revup/revup.py Outdated Show resolved Hide resolved
revup/revup.py Outdated Show resolved Hide resolved
@jerry-skydio
Copy link
Collaborator

as is this will result in a commit inserted 1 below the top commit rather than at the top. I can make a patch that fixes this since the original ordering of --insert was arbitrary anyway

revup/revup.py Outdated Show resolved Hide resolved
@jerry-skydio
Copy link
Collaborator

can you squash all the commits in this pr into one? you can use revup amend ;)

@malcolm-leclair-skydio
Copy link
Contributor Author

can you squash all the commits in this pr into one? you can use revup amend ;)

Sure thing. Out of curiosity, why not squash merge from github?

@malcolm-leclair-skydio malcolm-leclair-skydio force-pushed the malcolm.leclair/revup/main/revup_commit branch from fd53d70 to 77e26d6 Compare September 20, 2022 22:02
@jerry-skydio
Copy link
Collaborator

can you squash all the commits in this pr into one? you can use revup amend ;)

Sure thing. Out of curiosity, why not squash merge from github?

there are some cases where we wouldn't want a blanket squash -- such as large changes that touch multiple area or are done in multiple stages.

the other reason is that the user can do a better job of cleaning up commit messages after the squash. github just slaps them all together

@jerry-skydio
Copy link
Collaborator

relatedly as part of squashing can you clean up the commit message to be more descriptive of the changes? Unless the change is totally trivial its good to have a few sentances describing how and why its done. see the history of the repo for some examples

This command is an alias to "revup amend --insert"

Topic: revup_commit
@malcolm-leclair-skydio malcolm-leclair-skydio changed the title Add a command revup commit that aliases revup amend --insert Add a command revup commit Sep 20, 2022
@malcolm-leclair-skydio malcolm-leclair-skydio force-pushed the malcolm.leclair/revup/main/revup_commit branch from 77e26d6 to 4e64609 Compare September 20, 2022 23:33
@malcolm-leclair-skydio malcolm-leclair-skydio merged commit 5eb1a32 into main Sep 20, 2022
@malcolm-leclair-skydio malcolm-leclair-skydio deleted the malcolm.leclair/revup/main/revup_commit branch September 20, 2022 23:40
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