Deprecated: Please use https://github.com/wilzbach/git-tools
Simple tool to split up changes of files in batches of PRs. Note that this is for the very simple case if every change touches a separate file.
Support for splitting up more complicated PRs might come in the future.
The tool assumes that you have forked the repo you want to submit PRs too (e.g. dlang-tour) and cloned locally. Moreover this tool can only commit non-committed changes, so you might want to run git reset --soft upstream/master.
You can get the bash helper by downloading it directly from Github:
wget https://raw.githubusercontent.com/wilzbach/splitup-prs/master/splitup-prs
chmod +x splitup-prsIn the following it is assumed that you have created an alias (e.g. alias splitup-prs="~/projects/dlang/splitup-prs/splitup-prs" to it or have put this file into a folder of your $PATH environment (e.g. /usr/local/bin) variable.
- bash
- hub (optional - needed to automatically create the PR)
The first command will show you all the files that are considered as changes.
Under the hood it parses git status and filters for files in public/content.
Note that to avoid merge conflicts the index.yml is ignored. If you start from scratch
you can safely submit the index.yml once all your major PRs were accepted.
splitup-prsThis might print:
Adding: public/content/de/welcome/links-documentation.md
Adding: public/content/de/welcome/run-d-program-locally.md
Simulation was run. Now use -f/--force to apply.
Accordingly to submit these files to Github, execute:
splitup-prs -fThis will use the CLI tool hub to submit PRs at Github
and fallback to open a URL to submit the PR manually in case you haven't
installed the tool.
By default the tool will only process one PR per run, however once you are familiar
with the tool you can enable the batch mode with -a or --all.
splitup-prs -f --all- Simulation
splitup-prs -m 'Allow examples of the D spec to be runnable:' -b "run_spec_" -p "[run-spec]"- Step by step
splitup-prs -m 'Allow examples of the D spec to be runnable:' -b "run_spec_" -p "[run-spec]" -f- Submit all PRs
splitup-prs -m 'Allow examples of the D spec to be runnable:' -b "run_spec_" -p "[run-spec]" -fTo categorize the PRs the -p or --prefix flag can be given. It will
be prefixed before every PR and commit message. Example:
splitup-prs -p "[german]"Similar to -p, but applied only for the git commit message.
It comes after the prefix, but before the file name.
splitup-prs -m "My fancy git commit message"Allows to use a prefix before the generated branches, e.g.
splitup-prs -b "run_spec_"File paths will use underscores instead of slashes.
For all added files, only use their basename for the branch name and
git commit message.
By default, the path within the git directory is used, but with slashes
translated to underscores. Example
- file:
foo/bar/duck.md - default branch name:
foo_bar_duck --basenamebranch name:duck
Be careful with this option. Multiple files with the same filename will lead to errors.
Switch from the simulation mode and do the actions in the real world.
Don't stop after sending one PR, send all in one run.
If you run this the first time, make a copy of your work or make a new clone of the repository.
Simply reset your changes to the the ones of the upstream branch.
Warning: this will remove your new commits, but not the changes.
git reset --soft upstream/master
If you haven't added an upstream remote yet, you can also try to remove the commits directly.
For example to remove one commit, but keep the changes run:
git reset --soft HEAD~1
Change to your master branch and checkout all changes from your branch:
git checkout master
git checkout my-fancy-branch -- .
If you don't use hub, you should to an upstream endpoint, s.t. the program
knows which URL to open:
git remote add origin [email protected]:dlang-tour/english.git
Let me know if you run into issues.
Boost License. See LICENSE.txt for more details.