max630 / git-rehi

git-rehi, history editor
https://github.com/max630/git-rehi/wiki
GNU General Public License v2.0
3 stars 0 forks source link

write-only inner merge support #1

Open max630 opened 11 years ago

max630 commented 11 years ago

User must be able to

  1. specify merge, specifying as the other parent created during current rebase
  2. continue pick sequence from some arbitrary commit, rather than last created. Commit have created during the rebase should be able to be used.

In original rebase, this could be performed with 'exec' keyword, and commands "git branch" (to create reference for later use), and "git reset". 'exec' could be also introduced for rebase2. Alternative ideas:

UP:

max630 commented 10 years ago

The most rough idea is just introduce a new commands to be used instead of exec ..., for reseting, creating references and mentioning them in merge and other commands. For example: