I'll queue your patch with the following interdiff for now.
* user-manual.txt: do not change emphasis (typography) in this patch---if
it needs to be changed, that should be a separate patch.
* builtin-fetch.c: an instance of "non fast-forward" was left
unconverted; fix it.
* contrib/hooks/post-receive-email: likewise.
By the way, in Documentation/git-init.txt there also is another "non
fast-forward"; since it is not a fix-up to this patch, I left it as-is.
We may want to change it as well while we are at it.
* git-gui: this is a straight revert of your patch, so that Shawn can
apply an undated version of this patch to his tree first, and then I
can pull the result from him.
$ git grep -i -n -e 'fast forward' -- git-gui/
will show what need to be changed. This is a key string of "mc", so
msgid in *.po files and git-gui.pot file need to consistently change,
even though the translated strings in *.po files may stay as before.
If you spot misconversions in here (or other "fast forward" that need to be
converted but I missed), please holler.
Thanks.
---
Documentation/user-manual.txt | 2 +-
builtin-fetch.c | 2 +-
contrib/hooks/post-receive-email | 2 +-
git-gui/lib/branch_create.tcl | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index 42d92fd..269ec47 100644
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -2115,7 +2115,7 @@ $ git checkout release && git pull
Important note! If you have any local changes in these branches, then
this merge will create a commit object in the history (with no local
-changes git will simply do a fast-forward merge). Many people dislike
+changes git will simply do a "fast-forward" merge). Many people dislike
the "noise" that this creates in the Linux history, so you should avoid
doing this capriciously in the "release" branch, as these noisy commits
will become part of the permanent history when you ask Linus to pull
diff --git a/builtin-fetch.c b/builtin-fetch.c
index 89cedc8..6303aa0 100644
--- a/builtin-fetch.c
+++ b/builtin-fetch.c
@@ -287,7 +287,7 @@ static int update_local_ref(struct ref *ref,
r ? "unable to update local ref" : "forced update");
return r;
} else {
- sprintf(display, "! %-*s %-*s -> %s (non fast-forward)",
+ sprintf(display, "! %-*s %-*s -> %s (non-fast-forward)",
SUMMARY_WIDTH, "[rejected]", REFCOL_WIDTH, remote,
pretty_ref);
return 1;
diff --git a/contrib/hooks/post-receive-email b/contrib/hooks/post-receive-email
index 3b075ad..58a35c8 100755
--- a/contrib/hooks/post-receive-email
+++ b/contrib/hooks/post-receive-email
@@ -316,7 +316,7 @@ generate_update_branch_email()
# List all of the revisions that were removed by this update, in a
# fast-forward update, this list will be empty, because rev-list O
- # ^N is empty. For a non fast-forward, O ^N is the list of removed
+ # ^N is empty. For a non-fast-forward, O ^N is the list of removed
# revisions
fast_forward=""
rev=""
diff --git a/git-gui/lib/branch_create.tcl b/git-gui/lib/branch_create.tcl
index f1235c7..3817771 100644
--- a/git-gui/lib/branch_create.tcl
+++ b/git-gui/lib/branch_create.tcl
@@ -77,7 +77,7 @@ constructor dialog {} {
-variable @opt_merge
pack $w.options.merge.no -side left
radiobutton $w.options.merge.ff \
- -text [mc "Fast-forward Only"] \
+ -text [mc "Fast Forward Only"] \
-value ff \
-variable @opt_merge
pack $w.options.merge.ff -side left
--
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