Implement squash filter for list of commits #948
Merged
Conversation
This file contains 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
christian-schilling
force-pushed
the
@changes/master/christian.schilling.de@gmail.com/squash-list
branch
8 times, most recently
from
a2e5670
to
a8ad071
Compare
christian-schilling
force-pushed
the
@changes/master/christian.schilling.de@gmail.com/squash-list
branch
from
a8ad071
to
27c103e
Compare
christian-schilling
force-pushed
the
@changes/master/christian.schilling.de@gmail.com/squash-list
branch
2 times, most recently
from
44de337
to
454f1c3
Compare
christian-schilling
force-pushed
the
@changes/master/christian.schilling.de@gmail.com/squash-list
branch
2 times, most recently
from
6ec80cf
to
cf41ad6
Compare
LMG
reviewed
Oct 14, 2022
LMG
reviewed
Oct 14, 2022
| @@ -43,7 +43,7 @@ | |||
| * add file2 | |||
| * add file1 | |||
|
|
|||
| $ josh-filter -s --squash --file file.josh | |||
| $ josh-filter -s --single --file file.josh | |||
There was a problem hiding this comment.
now that I think about it, it's weird that the result of this is the "initial" commit and not one of the three above...
LMG
reviewed
Oct 14, 2022
LMG
reviewed
Oct 14, 2022
LMG
reviewed
Oct 14, 2022
christian-schilling
force-pushed
the
@changes/master/christian.schilling.de@gmail.com/squash-list
branch
2 times, most recently
from
620288c
to
bc60d3f
Compare
This version of the squash filter will discard all but the listed commits. The `josh-filter` command gets an option to build this list from a pattern of refs. Change: squash-list
christian-schilling
force-pushed
the
@changes/master/christian.schilling.de@gmail.com/squash-list
branch
from
bc60d3f
to
9014cc5
Compare
LMG
approved these changes
Oct 31, 2022
christian-schilling
deleted the
@changes/master/christian.schilling.de@gmail.com/squash-list
branch
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.
This version of the squash filter will discard all but the listed commits.
The
josh-filtercommand gets an option to build this list from a pattern ofrefs.