Git Source Code Mirror. Please follow Documentation/SubmittingPatches procedure for any of your improvements.

cshell

Shawn O. Pearce 9c9f5fa97f 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>		2007-08-23 02:44:13 -04:00
lib
.gitignore
git-gui.sh	git-gui: Do not offer to stage three-way diff hunks into the index	2007-08-23 02:44:13 -04:00
GIT-VERSION-GEN
Makefile