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

A way to squash commits #129

Closed
FredrikNoren opened this issue Aug 22, 2013 · 6 comments · Fixed by #965
Closed

A way to squash commits #129

FredrikNoren opened this issue Aug 22, 2013 · 6 comments · Fixed by #965
Assignees
Labels
Milestone

Comments

@FredrikNoren
Copy link
Owner

Suggested by @slang800 in #92

@notslang
Copy link
Contributor

not totally sure what the UI would look like for this one... thoughts?

Make it easy to squash commits, (like you would do in an interactive rebase) but provide a warning about the consequences.

@Ajedi32
Copy link
Contributor

Ajedi32 commented Aug 22, 2013

Drag one commit into another and then click "squash"?

@notslang
Copy link
Contributor

and then just have a popup for the commit message of the resulting squashed commit?

... that sounds good, but I'm also thinking about squashing a range of commits - that would be really useful for me

@Ajedi32
Copy link
Contributor

Ajedi32 commented Aug 22, 2013

Drag to select multiple successive commits (or ctrl+click, or shift+click), then right click the selection and hit squash. That kind of functionality might be better as part of an interactive rebase feature though...

@notslang
Copy link
Contributor

or just a general UI paradigm that could also be used for stuff like:

  • seeing a diff of all selected commits
  • cherry pick several commits

also, using the shift + arrow convention to select commits in order, and ctrl + click to select them separately would be nice

@jcowgar
Copy link

jcowgar commented Sep 9, 2017

Drag one commit into another and then click "squash"? by @Ajedi32 is the best suggestion. Start simple and see where it goes from there.

Other git clients when doing a squash merge will simply call git merge --squash branch-name. That then leaves the git repo in an uncommitted state. They will then simply switch to the build in commit view and let the developer take it from there.

This would be a fantastic addition to ungit.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging a pull request may close this issue.

5 participants