Editors often give easier handling of patch files if the
filename ends with .patch, so use it instead of .txt.
Signed-off-by: Junio C Hamano <junkio@xxxxxxx>
---
Junio C Hamano <junkio@xxxxxxx> writes:
> "Josh Boyer" <jwboyer@xxxxxxxxx> writes:
>
>> On 1/17/07, Junio C Hamano <junkio@xxxxxxx> wrote:
>>
>>> Two minor objections to changing the default are: (1) it's a
>>> change and any change is bad ;-) and (2) the reason I changed it
>>> to .txt before submitting the original format-patch to Linus was
>>> because Emacs wanted to go into its "diff" mode when files are
>>> named with .patch suffix, which had two annoyances (read-only by
>>> default, and editing patch tried to automatically recount diff
>>> and its recounting screwed up in some cases I do not remember
>>> the details about).
>>
>> Well there's your problem. You're using Emacs. ;)
>
> Fair enough. Its probably that there is something wrong in the
> way I am using Emacs diff/patch editing mode. Even if the
> problem I had were because of bugs in Emacs, the users of git
> should not have to suffer from "unusual" suffixes to work them
> around.
>
> So that lifts one of the objections. What should be done to the
> other one --- time for a quick poll?
Documentation/git-format-patch.txt | 15 +++++++--------
.../howto/rebase-from-internal-branch.txt | 2 +-
builtin-log.c | 2 +-
3 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt
index c0ffe99..49f51bb 100644
--- a/Documentation/git-format-patch.txt
+++ b/Documentation/git-format-patch.txt
@@ -79,9 +79,9 @@ OPTIONS
provide a new patch series.
--suffix=.<sfx>::
- Instead of using `.txt` as the suffix for generated
+ Instead of using `.patch` as the suffix for generated
filenames, use specifed suffix. A common alternative is
- `--suffix=.patch`.
+ `--suffix=.txt`.
+
Note that you would need to include the leading dot `.` if you
want a filename like `0001-description-of-my-change.patch`, and
@@ -91,15 +91,14 @@ not add any suffix.
CONFIGURATION
-------------
You can specify extra mail header lines to be added to each
-message in the repository configuration as follows:
+message in the repository configuration. Also you can specify
+the default suffix different from the built-in one:
+------------
[format]
headers = "Organization: git-foo\n"
-
-You can specify default suffix used:
-
-[format]
- suffix = .patch
+ suffix = .txt
+------------
EXAMPLES
diff --git a/Documentation/howto/rebase-from-internal-branch.txt b/Documentation/howto/rebase-from-internal-branch.txt
index fcd64e9..3b3a5c2 100644
--- a/Documentation/howto/rebase-from-internal-branch.txt
+++ b/Documentation/howto/rebase-from-internal-branch.txt
@@ -106,7 +106,7 @@ prepare #2 and #3 for e-mail submission.
$ git format-patch master^^ master
-This creates two files, 0001-XXXX.txt and 0002-XXXX.txt. Send
+This creates two files, 0001-XXXX.patch and 0002-XXXX.patch. Send
them out "To: " your project maintainer and "Cc: " your mailing
list. You could use contributed script git-send-email if
your host has necessary perl modules for this, but your usual
diff --git a/builtin-log.c b/builtin-log.c
index 930cc04..f3cff13 100644
--- a/builtin-log.c
+++ b/builtin-log.c
@@ -197,7 +197,7 @@ static int istitlechar(char c)
static char *extra_headers = NULL;
static int extra_headers_size = 0;
-static const char *fmt_patch_suffix = ".txt";
+static const char *fmt_patch_suffix = ".patch";
static int git_format_config(const char *var, const char *value)
{
--
1.5.0.rc1.gde38
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html