summaryrefslogtreecommitdiff
path: root/git-gui/git-gui.sh
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2007-08-23 06:44:13 (GMT)
committerShawn O. Pearce <spearce@spearce.org>2007-08-23 06:44:13 (GMT)
commit9c9f5fa97fe078b59be14a6bcabb851745ddd48c (patch)
treefec2e9c14273135ca42b767048f598fda1fd7dc6 /git-gui/git-gui.sh
parent9f4119eb7651c7898f385198409be4ca051bc7ef (diff)
downloadgit-9c9f5fa97fe078b59be14a6bcabb851745ddd48c.zip
git-9c9f5fa97fe078b59be14a6bcabb851745ddd48c.tar.gz
git-9c9f5fa97fe078b59be14a6bcabb851745ddd48c.tar.bz2
git-gui: Do not offer to stage three-way diff hunks into the index
git-apply does not accept a patch that was generated as a three-way combined diff format such as we see during merge conflicts. If we get such a diff in our diff viewer and try to send it to git-apply it just errors out and the user is left confused wondering why they cannot stage that hunk. Instead of feeding a known to be unacceptable hunk to git-apply we now just disable the stage/unstage context menu option if the hunk came from a three way diff. The user may still be confused about why they cannot work with a combined diff, but at least they are only confused as to why git-gui is not offering them the action. Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Diffstat (limited to 'git-gui/git-gui.sh')
0 files changed, 0 insertions, 0 deletions