From 3bae8d4da1ee7fce0cf1ef9fcf49656ca1e48769 Mon Sep 17 00:00:00 2001 From: Jonathan Nieder Date: Fri, 3 Dec 2010 14:04:17 -0600 Subject: [PATCH 1/3] Documentation: do not misinterpret pull refspec as bold text Use the {asterisk} entity to avoid mistreating the asterisks in "(e.g., refs/heads/*:refs/remotes/origin/*)" as delimiters for bold text. From a quick search with 'git grep -e "\*.*\*"', this seems to be the last example of this particular formatting problem. Signed-off-by: Jonathan Nieder Signed-off-by: Junio C Hamano --- Documentation/git-pull.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt index e1b0bd286..abbc3eb3e 100644 --- a/Documentation/git-pull.txt +++ b/Documentation/git-pull.txt @@ -27,8 +27,8 @@ With `--rebase`, it runs 'git rebase' instead of 'git merge'. passed to linkgit:git-fetch[1]. can name an arbitrary remote ref (for example, the name of a tag) or even a collection of refs with corresponding remote tracking branches -(e.g., refs/heads/*:refs/remotes/origin/*), but usually it is -the name of a branch in the remote repository. +(e.g., refs/heads/{asterisk}:refs/remotes/origin/{asterisk}), +but usually it is the name of a branch in the remote repository. Default values for and are read from the "remote" and "merge" configuration for the current branch From f36a4fa8ef611c37c890ed21a388a5ece801a3de Mon Sep 17 00:00:00 2001 From: Giuseppe Bilotta Date: Fri, 3 Dec 2010 17:47:35 +0100 Subject: [PATCH 2/3] CodingGuidelines: mention whitespace preferences for shell scripts Signed-off-by: Giuseppe Bilotta Signed-off-by: Junio C Hamano --- Documentation/CodingGuidelines | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Documentation/CodingGuidelines b/Documentation/CodingGuidelines index 09ffc4656..46f8a3fab 100644 --- a/Documentation/CodingGuidelines +++ b/Documentation/CodingGuidelines @@ -31,6 +31,10 @@ But if you must have a list of rules, here they are. For shell scripts specifically (not exhaustive): + - We use tabs for indentation. + + - Case arms are indented at the same depth as case and esac lines. + - We prefer $( ... ) for command substitution; unlike ``, it properly nests. It should have been the way Bourne spelled it from day one, but unfortunately isn't. From 6079ec6680da5e40d15d981c24051e9bf5c226fc Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 3 Dec 2010 15:18:06 -0800 Subject: [PATCH 3/3] Git 1.7.3.3 Signed-off-by: Junio C Hamano --- Documentation/RelNotes/1.7.3.3.txt | 12 ++++++++++-- RelNotes | 2 +- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/Documentation/RelNotes/1.7.3.3.txt b/Documentation/RelNotes/1.7.3.3.txt index 8d547efac..9b2b2448d 100644 --- a/Documentation/RelNotes/1.7.3.3.txt +++ b/Documentation/RelNotes/1.7.3.3.txt @@ -1,6 +1,15 @@ Git v1.7.3.3 Release Notes ========================== +In addition to the usual fixes, this release also includes support for +the new "add.ignoreErrors" name given to the existing "add.ignore-errors" +configuration variable. + +The next version, Git 1.7.4, and future versions, will support both +old and incorrect name and the new corrected name, but without this +backport, users who want to use the new name "add.ignoreErrors" in +their repositories cannot use older versions of Git. + Fixes since v1.7.3.2 -------------------- @@ -42,5 +51,4 @@ Fixes since v1.7.3.2 * "git-p4" (in contrib/) did not correctly handle deleted files. - -Other minor fixes and documentation updates may be included. +Other minor fixes and documentation updates are also included. diff --git a/RelNotes b/RelNotes index c2b0d4d12..9653ffeb8 120000 --- a/RelNotes +++ b/RelNotes @@ -1 +1 @@ -Documentation/RelNotes/1.7.3.2.txt \ No newline at end of file +Documentation/RelNotes/1.7.3.3.txt \ No newline at end of file