summaryrefslogtreecommitdiff
path: root/revision.h
diff options
context:
space:
mode:
authorJohannes Schindelin <johannes.schindelin@gmx.de>2016-10-21 14:25:04 +0200
committerJunio C Hamano <gitster@pobox.com>2016-10-21 09:32:34 -0700
commitb5a670452c742345918e12b1d002b3502fe1de96 (patch)
treeeefd20acad5f72b3b4353ef305681aba9f145613 /revision.h
parentc22f7dfb0c34da55390d820ff69b9568a3be4a46 (diff)
downloadgit-b5a670452c742345918e12b1d002b3502fe1de96.tar.gz
sequencer: prepare for rebase -i's commit functionality
In interactive rebases, we commit a little bit differently than the sequencer did so far: we heed the "author-script", the "message" and the "amend" files in the .git/rebase-merge/ subdirectory. Likewise, we may want to edit the commit message *even* when providing a file containing the suggested commit message. Therefore we change the code to not even provide a default message when we do not want any, and to call the editor explicitly. Also, in "interactive rebase" mode we want to skip reading the options in the state directory of the cherry-pick/revert commands. Finally, as interactive rebase's GPG settings are configured differently from how cherry-pick (and therefore sequencer) handles them, we will leave support for that to the next commit. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'revision.h')
0 files changed, 0 insertions, 0 deletions