[[[
Rename --git-diff option to --git for consistency with Mercurial and diff.

* subversion/svn/main.c: Replace "git-diff" option with "git"

* subversion/tests/cmdline/diff_tests.py: Fix to use new --git option
]]]

Index: subversion/tests/cmdline/diff_tests.py
===================================================================
--- subversion/tests/cmdline/diff_tests.py	(revision 989090)
+++ subversion/tests/cmdline/diff_tests.py	(working copy)
@@ -3394,7 +3394,7 @@
                            "working copy", copyfrom=lambda_path)
 
   svntest.actions.run_and_verify_svn(None, expected_output, [], 'diff', 
-                                     '--git-diff', wc_dir)
+                                     '--git', wc_dir)
 
 def diff_git_format_url_wc(sbox):
   "create a diff in git unidiff format for url-wc"
@@ -3433,7 +3433,7 @@
   ]
 
   svntest.actions.run_and_verify_svn(None, expected_output, [], 'diff', 
-                                     '--git-diff',
+                                     '--git',
                                      '--old', repo_url + '@1', '--new',
                                      wc_dir)
 
@@ -3473,7 +3473,7 @@
   ]
 
   svntest.actions.run_and_verify_svn(None, expected_output, [], 'diff', 
-                                     '--git-diff', 
+                                     '--git', 
                                      '--old', repo_url + '@1', '--new',
                                      repo_url + '@2')
 
@@ -3641,7 +3641,7 @@
                            delete=True, text_changes=False)
 
   svntest.actions.run_and_verify_svn(None, expected_output, [], 'diff', 
-                                     '--git-diff', wc_dir)
+                                     '--git', wc_dir)
 
 
 ########################################################################
Index: subversion/svn/main.c
===================================================================
--- subversion/svn/main.c	(revision 989090)
+++ subversion/svn/main.c	(working copy)
@@ -368,7 +368,7 @@
                        N_("override diff-cmd specified in config file\n"
                        "                             "
                        "[alias: --idiff]")},
-  {"git-diff", opt_use_git_diff_format, 0,
+  {"git", opt_use_git_diff_format, 0,
                        N_("use git's extended diff format\n")},
                   
   /* Long-opt Aliases