-
-
Notifications
You must be signed in to change notification settings - Fork 76
Add "merge --input-file-list NAME ..." as a way to exceed CLI limits #328
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
Open
jimklimov
wants to merge
13
commits into
CycloneDX:main
Choose a base branch
from
jimklimov:merge-multiple
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 9 commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
a58a70a
Add "merge --input-file-list NAME ..." as a way to exceed CLI limits
jimklimov f869610
MergeCommand: Convert singular --input-file-list to potentially multi…
jimklimov d1aa106
MergeCommand: Convert singular --input-file-list to potentially multi…
jimklimov 3953595
MergeCommand: input-files-list: fix iterations and sanity checks
jimklimov 56c2493
MergeCommand: in options handle "--input-files" before "--input-files…
jimklimov fdac250
MergeCommand: behave like before if no input-files* args were specified
jimklimov 1cc6622
MergeCommand: implement support for --input-files-list0
jimklimov 064715e
MergeCommand: align coding style of changes for InputFilesList with e…
jimklimov 89499f5
MergeCommand: rename --input-files-list0 to --input-files-nul-list (w…
jimklimov bbd41e4
MergeCommand: when handling --input-file-(nul-)list, avoid adding dup…
jimklimov 4017eb9
MergeCommand: refactor DetermineInputFiles() into a separate method
jimklimov d123703
MergeCommand: DetermineInputFiles() refine progress and result reporting
jimklimov 8722b9a
Merge remote-tracking branch 'upstream/main' into merge-multiple
jimklimov File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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.
Uh oh!
There was an error while loading. Please reload this page.