From: Alexander Gavrilov <angavrilov@gmail.com>
Date: Fri, 12 Sep 2008 18:43:49 +0000 (+0400)
Subject: git-gui: Add more integration options to citool.
X-Git-Tag: v1.6.1-rc1~211^2~10
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/1e65c6225dea2e15df81f6c91927cb0b8fab443c?ds=inline;hp=1e65c6225dea2e15df81f6c91927cb0b8fab443c

git-gui: Add more integration options to citool.

- Make citool return nonzero exit code if it did not commit.
- Add a mode where it does not actually commit and simply
exits with zero code. Commit message is either disabled,
or simply dumped to GITGUI_EDITMSG before exiting.
- Add an option to immediately start it in amend mode.

Rationale:

1) Use 'git citool --nocommit' instead of mergetool in scripts.
2) Use 'git citool --amend' to edit commits while rebasing.

Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
---