Add git amend --reparent option
#646
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
arxanas
force-pushed
the
arxanas/amend2
branch
from
1551ba4 to
c50a8aa
Compare
arxanas
force-pushed
the
arxanas/build
branch
from
47f6be8 to
6517e06
Compare
arxanas
force-pushed
the
arxanas/amend2
branch
from
c50a8aa to
0ac78fb
Compare
We already have a mechanism for commit replacement for merge commits specifically, to handle cases where we couldn't compute the merge from scratch (and where the result of the merge should be the same anyways). This commit generalizes the mechanism to work for all kinds of commits, so that we can replace arbitrary commits with different trees without reapplying patches. I think this also fixes a bug in merge commits where the parent order was not preserved when conducting a new merge.
This option rewrites the tree for the current commit while leaving all descendant commits the same. This can be useful when applying formatting or refactoring changes to a given commit for which you would rather adjust the descendant commits manually than try to merge the conflicting changes.
arxanas
force-pushed
the
arxanas/amend2
branch
from
0ac78fb to
e3e7b1d
Compare
Owner
Author
Collaborator
|
Sorry to be late here. I glanced at this earlier and it looked good to me, fwiw. |
Owner
Author
|
@claytonrcarter no worries, I was just trying to keep you up to date in case it affected your |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
No description provided.