Refactor and improve git squash
#239
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
`git squash` refactor: - first argument can be a branch or a commit reference - the `--me` argument is not required anymore - use `git reset --soft` is squashing on a current branch - if squashing on master branch, prompt for confirmation - does not delete provided branch after squashing - fix bug: if `git merge --squash` command fails, exit script Update README and man pages. Fixes #95 Closes #198
Collaborator
|
Kudos! @bruno. |
hemanth
added a commit
that referenced
this pull request
Jul 21, 2014
Refactor and improve `git squash`.
tardypad
pushed a commit
to tardypad/git-extras
that referenced
this pull request
Jul 13, 2016
Refactor and improve `git squash`.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This pull request contains refactoring work and improvements for
git squash.These issues are handled:
reset --softis used as per issue refactor git-squash #198here
heavy branch manipulation. Inline todo
here
I did a decent round of testing for this locally and everything was fine.
Please let me know if you have any questions or code has to be tweaked etc.