git-revise
git-revise copied to clipboard
mystor
A handy tool for doing efficient in-memory commit rebases & fixups
Instruction format allows custom formatting for todo list during interactive rebase https://git-scm.com/docs/git-rebase#Documentation/git-rebase.txt-rebaseinstructionFormat
Enabled via the boolean config option revise.run-hooks.commit-msg
I faced merge conflict during rebase with revise. It says: ``` pick 16447b3216ee [jps] [202 IDEA only] Fix compilation pick ffa7cee0d574 [jps] Fix compilation JDK Path Kotlin extensions pick 490c36a87657...
Quote from man git-commit: ``` --cleanup= This option determines how the supplied commit message should be cleaned up before committing. The can be strip, whitespace, verbatim, scissors or default. strip...
I've been reading Elijah Newren's [blog posts](https://blog.palantir.com/optimizing-gits-merge-machinery-1-127ceb0ef2a1) on optimizing git's merge implementation. To enable the optimizations, they added the new "ort" merge backend. Crucially, it can merge without touching the...
The new GPG tests fail occasionally, for example in https://github.com/mystor/git-revise/pull/99/checks?check_run_id=3785380820 An excerpt from the job log is added below. I'm not sure if problem is the FileNotFoundError: [Errno 2] No...
`git-revise` does not appear to copy notes, unlike `git rebase` and `git commit --amend`. It would be great if it learned how to copy notes by default, ideally making use...
Frequently when splitting a commit, I want to split it into _more_ than two pieces. For example, there may be several kinds of independent kinds of changes that need to...
this git [doc](https://git-scm.com/docs/git-rebase#Documentation/git-rebase.txt---autosquash) states that: > ... A commit matches the ... if the commit subject matches, or if the ... refers to the commit’s hash. As a fall-back, partial...
Unless i just haven found that file this feature i have been missing: when revise tries to do its thing it sometimes fails which is mostly due to botching the...