author | Shawn O. Pearce <spearce@spearce.org> | |
Sun, 21 Jan 2007 09:51:45 +0000 (04:51 -0500) | ||
committer | Shawn O. Pearce <spearce@spearce.org> | |
Sun, 21 Jan 2007 09:51:45 +0000 (04:51 -0500) | ||
commit | 4f9d8519fb3297063392d0268c0430fe5a6a02f1 | |
tree | a439fd0788c10183205cc0d3577b76910703f2b0 | tree | snapshot |
parent | 6858efbda324ab30f8857a06000933bcc55b11cc | commit | diff |
git-gui: Improve the branch delete confirmation dialogs.
If the user is deleting a branch which is fully merged into the
selected test branch we should not confirm the delete with them,
the fact that the branch is fully merged means we can recover the
branch and no work will be lost.
If a branch is not fully merged, we should warn the user about which
branch(es) that is and continue deleting those which are fully merged.
We should only delete a branch if the user disables the merge check,
and in that case we should confirm with the user that a delete should
occur as this may cause them to lose changes.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
If the user is deleting a branch which is fully merged into the
selected test branch we should not confirm the delete with them,
the fact that the branch is fully merged means we can recover the
branch and no work will be lost.
If a branch is not fully merged, we should warn the user about which
branch(es) that is and continue deleting those which are fully merged.
We should only delete a branch if the user disables the merge check,
and in that case we should confirm with the user that a delete should
occur as this may cause them to lose changes.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
git-gui.sh | diff | blob | history |