| commit | c7bafad10d294cc0b26ab6171efd89dd9b132f70 | |
| author | Shawn O. Pearce <spearce@spearce.org> | |
| Mon, 12 Mar 2007 17:03:47 +0000 (12 13:03 -0400) | ||
| committer | Shawn O. Pearce <spearce@spearce.org> | |
| Mon, 12 Mar 2007 17:03:47 +0000 (12 13:03 -0400) | ||
| tree | faad73b1772cc8632ceb02ad4fb41e4ca2a5227b | treesnapshot (tar.gz zip) |
| parent | 0b5ea163d21163343579cd6eb9274ccc2190a0fe | commitdiff |
git-gui: Allow committing empty merges
Johannes Sixt noticed that git-gui would not let the user commit
a merge created by `git merge -s ours` as the ours strategy does
not alter the tree (that is HEAD^1^{tree} = HEAD^{tree} after the
merge). The same issue arises from amending such a merge commit.
We now permit an empty commit (no changed files) if we are doing
a merge commit. Core Git does this with its command line based
git-commit tool, so it makes sense for the GUI to do the same.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Johannes Sixt noticed that git-gui would not let the user commit
a merge created by `git merge -s ours` as the ours strategy does
not alter the tree (that is HEAD^1^{tree} = HEAD^{tree} after the
merge). The same issue arises from amending such a merge commit.
We now permit an empty commit (no changed files) if we are doing
a merge commit. Core Git does this with its command line based
git-commit tool, so it makes sense for the GUI to do the same.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
| git-gui.sh | diffblobblamehistory |