git/lib/commit.tcl, branch gitgui-0.21.0

Merge branch 'os/preserve-author' into pu

2016-10-20T10:07:24Z

git-gui: avoid persisting modified author identity

2016-10-06T21:18:47Z

Commit 7e71adc77f fixes a problem with git-gui failing to pick up the original author identity during a commit --amend operation. However, the new author details then become persistent for the remainder of the session. This commit fixes this by ensuring the environment variables are reset and the author information reset once the commit is completed. The relevant changes were reworked to reduce global variables. Signed-off-by: Pat Thoyts

git-gui: respect commit.gpgsign again

2016-09-11T21:52:27Z

As of v2.9.0, `git commit-tree` no longer heeds the `commit.gpgsign` config setting. This broke committing with GPG signature in Git GUI. This fixes https://github.com/git-for-windows/git/issues/850 Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano

git-gui: Do not reset author details on amend

2016-04-14T14:38:09Z

git commit --amend preserves the author details unless --reset-author is given. git-gui discards the author details on amend. Fix by reading the author details along with the commit message, and setting the appropriate environment variables required for preserving them. Reported long ago in the mailing list[1]. [1] http://article.gmane.org/gmane.comp.version-control.git/243921 Signed-off-by: Orgad Shaneh

git-gui: remove .git/CHERRY_PICK_HEAD after committing

2012-09-17T10:59:05Z

Adding _git_ps1() to one's bash prompt displays various repo status info after each command. After committing a git cherry-pick -n using git-gui, the prompt still contains the "|CHERRY-PICKING" flag. Delete the file causing this flag when cleaning up. Signed-off-by: Beat Bolli Signed-off-by: Pat Thoyts

git-gui: Fix a loose/lose mistake

2012-09-17T10:53:37Z

Acked-by: Junio C Hamano Signed-off-by: Beat Bolli Signed-off-by: Pat Thoyts

git-gui: don't warn for detached head when rebasing

2011-11-05T00:39:04Z

Signed-off-by: Bert Wesarg Signed-off-by: Pat Thoyts

git-gui: make config gui.warndetachedcommit a boolean

2011-11-05T00:39:03Z

Signed-off-by: Bert Wesarg Signed-off-by: Pat Thoyts

git-gui: warn when trying to commit on a detached head

2011-05-20T21:49:15Z

The commandline is already warning when checking out a detached head. Since the only thing thats potentially dangerous is to create commits on a detached head lets warn in case the user is about to do that. Signed-off-by: Heiko Voigt Signed-off-by: Pat Thoyts

git-gui: learn more type change states

2011-01-28T00:16:50Z

Support the following states with type change in git-gui: AT, MT, TD, TM Signed-off-by: Bert Wesarg Signed-off-by: Pat Thoyts