1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-06-03 18:06:10 +02:00
git/contrib/fast-import
Shawn Bohrer 67abd41716 git-p4: Unset P4DIFF environment variable when using 'p4 -du diff'
A custom diffing utility can be specified for the 'p4 diff' command by
setting the P4DIFF environment variable.  However when using a custom
diffing utility such as 'vimdiff' passing options like -du can cause
unexpected behavior.

Since the goal is to generate a unified diff of the changes and attach
them to the bottom of the p4 submit log we should unset P4DIFF if it
has been set in order to generate the diff properly.

Signed-off-by: Shawn Bohrer <shawn.bohrer@gmail.com>
Signed-off-by: Simon Hausmann <simon@lst.de>
2008-03-13 08:57:29 +01:00
..
git-import.perl contrib/fast-import: add perl version of simple example 2007-09-18 03:14:18 -07:00
git-import.sh contrib/fast-import: add simple shell example 2007-09-18 03:14:16 -07:00
git-p4 git-p4: Unset P4DIFF environment variable when using 'p4 -du diff' 2008-03-13 08:57:29 +01:00
git-p4.bat Make the command call silent 2007-05-15 16:07:41 +02:00
git-p4.txt Mention remotes/p4/master also in the documentation. 2007-06-11 23:30:23 +02:00
import-tars.perl Merge branch 'maint' 2007-05-16 12:43:05 -07:00