summaryrefslogtreecommitdiff
path: root/git-gui/lib
diff options
context:
space:
mode:
authorAlexander Gavrilov <angavrilov@gmail.com>2008-09-20 08:19:18 (GMT)
committerShawn O. Pearce <spearce@spearce.org>2008-09-24 19:51:43 (GMT)
commit3e34838caf796e67c057a136d1fdfe1d4286a003 (patch)
tree2ee7832031889e8ca002f3d1ca680ac32b835852 /git-gui/lib
parent6fc835a3f36146006bb33362368cf9d314877e51 (diff)
downloadgit-3e34838caf796e67c057a136d1fdfe1d4286a003.zip
git-3e34838caf796e67c057a136d1fdfe1d4286a003.tar.gz
git-3e34838caf796e67c057a136d1fdfe1d4286a003.tar.bz2
git-gui: Reenable staging unmerged files by clicking the icon.
This restores functionality of the file icon for unmerged files. Safety is enforced by loading the diff and checking for lines that look like conflict markers. If such lines are found, or the conflict involves deletion and/or symlinks, a confirmation dialog is presented. Otherwise, the icon immediately stages the working copy version of the file. Includes a revert of 2fe5b2ee42897a3acc78e5ddaace3775eb2713ca (Restore ability to Stage Working Copy for conflicts) Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com> Tested-by: Johannes Sixt <johannes.sixt@telecom.at> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Diffstat (limited to 'git-gui/lib')
0 files changed, 0 insertions, 0 deletions