diff options
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/RelNotes/1.8.1.txt | 24 | ||||
| -rw-r--r-- | Documentation/config.txt | 5 |
2 files changed, 16 insertions, 13 deletions
diff --git a/Documentation/RelNotes/1.8.1.txt b/Documentation/RelNotes/1.8.1.txt index 8f53af3403..c507b129bb 100644 --- a/Documentation/RelNotes/1.8.1.txt +++ b/Documentation/RelNotes/1.8.1.txt @@ -19,7 +19,7 @@ variable in this release. "git branch --set-upstream" is deprecated and may be removed in a relatively distant future. "git branch [-u|--set-upstream-to]" has -been introduced with a saner order of arguments. +been introduced with a saner order of arguments to replace it. Updates since v1.8.0 @@ -50,7 +50,8 @@ UI, Workflows & Features * When "git checkout" checks out a branch, it tells the user how far behind (or ahead) the new branch is relative to the remote tracking branch it builds upon. The message now also advises how to sync - them up by pushing or pulling. + them up by pushing or pulling. This can be disabled with the + advice.statusHints configuration variable. * "git config --get" used to diagnose presence of multiple definitions of the same variable in the same configuration file as @@ -69,17 +70,18 @@ UI, Workflows & Features * "git log --grep=<pcre>" learned to honor the "grep.patterntype" configuration set to "perl". - * "git replace -d <object>" now interprets <object>, instead of only - accepting full hex object name. + * "git replace -d <object>" now interprets <object> as an extended + SHA-1 (e.g. HEAD~4 is allowed), instead of only accepting full hex + object name. * "git rm $submodule" used to punt on removing a submodule working tree to avoid losing the repository embedded in it. Because recent git uses a mechanism to separate the submodule repository from the submodule working tree, "git rm" learned to detect this - case and removes the submodule working tree when it is safe. + case and removes the submodule working tree when it is safe to do so. * "git send-email" used to prompt for the sender address, even when - the committer identify is well specified (e.g. via user.name and + the committer identity is well specified (e.g. via user.name and user.email configuration variables). The command no longer gives this prompt when not necessary. @@ -103,7 +105,7 @@ UI, Workflows & Features * "git symbolic-ref" learned the "-d $symref" option to delete the named symbolic ref, which is more intuitive way to spell it than - "update-ref -d --no-deref". + "update-ref -d --no-deref $symref". Foreign Interface @@ -119,10 +121,10 @@ Performance, Internal Implementation, etc. * Compilation on Cygwin with newer header files are supported now. - * The logic to generate the initial advertisement from - "upload-pack" (what is invoked by "git fetch" on the other side - of the connection) to list what refs are available in the - repository has been optimized. + * The logic to generate the initial advertisement from "upload-pack" + (i.e. what is invoked by "git fetch" on the other side of the + connection) to list what refs are available in the repository has + been optimized. * The logic to find set of attributes that match a given path has been optimized. diff --git a/Documentation/config.txt b/Documentation/config.txt index e70216dfe6..bf8f911e1f 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -160,9 +160,10 @@ advice.*:: it resulted in a non-fast-forward error. statusHints:: Show directions on how to proceed from the current - state in the output of linkgit:git-status[1] and in + state in the output of linkgit:git-status[1], in the template shown when writing commit messages in - linkgit:git-commit[1]. + linkgit:git-commit[1], and in the help message shown + by linkgit:git-checkout[1] when switching branch. commitBeforeMerge:: Advice shown when linkgit:git-merge[1] refuses to merge to avoid overwriting local changes. |