aboutsummaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-09-12 14:10:54 -0700
committerJunio C Hamano <gitster@pobox.com>2012-09-12 14:12:48 -0700
commite70d1632bdaf25a9ee528e78133cab319083eade (patch)
tree740ec85d44857ebf40dbe4e6318545fdaa506b18 /Documentation
parent3503e9ab32c7a478d0d985171c50a901a2695162 (diff)
downloadgit-e70d1632bdaf25a9ee528e78133cab319083eade.tar.gz
git-e70d1632bdaf25a9ee528e78133cab319083eade.tar.xz
Further merging in preparation for 1.7.12.1
Describe the following in the draft release notes: . jc/apply-binary-p0 . jc/dotdot-is-parent-directory . jc/maint-doc-checkout-b-always-takes-branch-name . jk/maint-http-half-auth-push . kk/maint-for-each-ref-multi-sort Yet to be merged before 1.7.12.1 are: . jk/config-warn-on-inaccessible-paths . jk/maint-quiet-is-synonym-to-s-in-log . mz/cherry-pick-cmdline-order Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/RelNotes/1.7.12.1.txt26
1 files changed, 26 insertions, 0 deletions
diff --git a/Documentation/RelNotes/1.7.12.1.txt b/Documentation/RelNotes/1.7.12.1.txt
index da51dd539..4088a166f 100644
--- a/Documentation/RelNotes/1.7.12.1.txt
+++ b/Documentation/RelNotes/1.7.12.1.txt
@@ -14,6 +14,11 @@ Fixes since v1.7.12
subcommands can be abbreviated to the unique prefix, but it was not
easy to find it described for new readers of the documentation set.
+ * The synopsis said "checkout [-B branch]" to make it clear the
+ branch name is a parameter to the option, but the heading for the
+ option description was "-B::", not "-B branch::", making the
+ documentation misleading.
+
* The "--topo-order", "--date-order" (and the lack of either means
the default order) options to "rev-list" and "log" family of
commands were poorly described in the documentation.
@@ -36,6 +41,14 @@ Fixes since v1.7.12
* Fallback 'getpass' implementation made unportable use of stdio API.
+ * "git apply -p0" did not parse pathnames on "diff --git" line
+ correctly. This caused patches that had pathnames in no other
+ places to be mistakenly rejected (most notably, binary patch that
+ does not rename nor change mode). Textual patches, renames or mode
+ changes have preimage and postimage pathnames in different places
+ in a form that can be parsed unambiguously and did not suffer from
+ this problem.
+
* "git commit --amend" let the user edit the log message and then
died when the human-readable committer name was given
insufficiently by getpwent(3).
@@ -44,9 +57,22 @@ Fixes since v1.7.12
did not advertise that they are available. fetch-pack has been
fixed not to do so.
+ * "git for-each-ref" did not currectly support more than one --sort
+ option.
+
+ * "git log .." errored out saying it is both rev range and a path
+ when there is no disambiguating "--" is on the command line.
+ Update the command line parser to interpret ".." as a path in such
+ a case.
+
* "git prune" without "-v" used to warn about leftover temporary
files (which is an indication of an earlier aborted operation).
+ * Pushing to smart HTTP server with recent Git fails without having
+ the username in the URL to force authentication, if the server is
+ configured to allow GET anonymously, while requiring authentication
+ for POST.
+
* The reflog entries left by "git rebase" and "git rebase -i" were
inconsistent (the interactive one gave an abbreviated object name).