Skydio / revup

Effortlessly create and manage pull requests without changing branches. Powers a stacked diffs workflow with python and git "plumbing" commands.
https://github.com/Skydio/revup
MIT License
317 stars 67 forks source link

Add a command revup commit #52

Closed malcolm-leclair-skydio closed 2 years ago

malcolm-leclair-skydio commented 2 years ago

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

Topic: revup_commit

malcolm-leclair-skydio commented 2 years ago

Reviews in this chain: └https://github.com/Skydio/revup/pull/52 Add a command revup commit

malcolm-leclair-skydio commented 2 years ago
# 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
jerry-skydio commented 2 years ago

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

jerry-skydio commented 2 years ago

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

malcolm-leclair-skydio commented 2 years ago

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?

jerry-skydio commented 2 years ago

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 commented 2 years ago

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