On Wed, Jan 5, 2011 at 12:59 PM, Andrew Dunstan <andrew@dunslane.net> wrote:
> I've abandoned the use of an external diff program for git. If I need
> context diffs I produce them by piping normal git diff output through
> "filterdiff --format=context".
One possible disadvantage of that it strips out this stuff:
diff --git a/src/backend/commands/alter.c b/src/backend/commands/alter.c
index 6a9b21d..1c6ae02 100644
I actually haven't figured out exactly under what circumstances that
index information is used by git, but I think in theory it's supposed
to make it possible for git to apply patches that would otherwise
fail. However, I actually haven't figured out the best way to make
git do that, either; I'm still using patch -p1, which is basically
horrible if there are >0 conflicts.
--
Robert Haas
EnterpriseDB: http://www.enterprisedb.com
The Enterprise PostgreSQL Company