| commit | 15e1374927b1dc42a575235c63852d444cf9c1ab | |
| author | Shawn O. Pearce <spearce@spearce.org> | |
| Sun, 21 Jan 2007 19:14:54 +0000 (21 14:14 -0500) | ||
| committer | Shawn O. Pearce <spearce@spearce.org> | |
| Mon, 22 Jan 2007 03:47:56 +0000 (21 22:47 -0500) | ||
| tree | 7b54174af76f593853da5b1c18d8f86f7c04881c | treesnapshot (tar.gz zip) |
| parent | 66cc17d1d3bead2ebf6fbe41ea31e7ec111d891b | commitdiff |
git-gui: Improve the merge check interface for branch deletion.
Just like how we split out the local and remote branches into two
different pick lists for branch creation, we should do the same
thing for branch deletion. This means that there are really 3
modes of operation here:
* delete only if merged into designated local branch;
* delete only if merged into designated tracking (remote) branch;
* delete no matter what
So we now use radio buttons to select between these operations.
We still default to checking for merge into the current branch,
as that is probably the most commonly used behavior. It also is
what core Git's command line tools do.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Just like how we split out the local and remote branches into two
different pick lists for branch creation, we should do the same
thing for branch deletion. This means that there are really 3
modes of operation here:
* delete only if merged into designated local branch;
* delete only if merged into designated tracking (remote) branch;
* delete no matter what
So we now use radio buttons to select between these operations.
We still default to checking for merge into the current branch,
as that is probably the most commonly used behavior. It also is
what core Git's command line tools do.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
| git-gui.sh | diffblobblamehistory |