diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-12-03 15:23:50 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-12-03 15:23:55 -0800 |
| commit | b281796eeb925f5e91d27cd6c6c579c925577160 (patch) | |
| tree | 81a2a185c76af961dfa5145a30779b5f59170202 | |
| parent | 1c2ab4303354da23ff74ce2ea4a99b69fcfae825 (diff) | |
| parent | 6079ec6680da5e40d15d981c24051e9bf5c226fc (diff) | |
| download | git-b281796eeb925f5e91d27cd6c6c579c925577160.tar.gz git-b281796eeb925f5e91d27cd6c6c579c925577160.tar.xz | |
Merge branch 'maint' to sync with Git 1.7.3.3
* maint:
Git 1.7.3.3
CodingGuidelines: mention whitespace preferences for shell scripts
Documentation: do not misinterpret pull refspec as bold text
Conflicts:
Documentation/git-pull.txt
RelNotes
| -rw-r--r-- | Documentation/CodingGuidelines | 4 | ||||
| -rw-r--r-- | Documentation/RelNotes/1.7.3.3.txt | 12 | ||||
| -rw-r--r-- | Documentation/git-pull.txt | 4 |
3 files changed, 16 insertions, 4 deletions
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. 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/Documentation/git-pull.txt b/Documentation/git-pull.txt index e47361f23..4db73737b 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]. <refspec> 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 <repository> and <branch> are read from the "remote" and "merge" configuration for the current branch |