From: Junio C Hamano Date: Wed, 18 Apr 2007 04:57:17 +0000 (+0000) Subject: Autogenerated HTML docs for v1.5.1.1-159-g2c78 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=28cea6a04fa5a1b3b38670013723f52a329ba001;p=git.git Autogenerated HTML docs for v1.5.1.1-159-g2c78 --- diff --git a/RelNotes-1.5.1.2.txt b/RelNotes-1.5.1.2.txt new file mode 100644 index 000000000..f58268f6b --- /dev/null +++ b/RelNotes-1.5.1.2.txt @@ -0,0 +1,37 @@ +GIT v1.5.1.2 Release Notes (draft) +========================== + +Fixes since v1.5.1.1 +-------------------- + +* Bugfixes + + - "git diff a/ b/" incorrectly fell in "diff between two + filesystem objects" codepath, when the user most likely + wanted to limit the extent of output to two tracked + directories. + + - git-quiltimport had the same bug as we fixed for + git-applymbox in v1.5.1.1 -- it gave an alarming "did not + have any patch" message (but did not actually fail and was + harmless). + + - various git-svn fixes. + + - Sample update hook incorrectly always refused requests to + delete branches through push. + + - git-blame on a very long working tree path had buffer + overrun problem. + +* Documentation updates + + - Various documentation updates from J. Bruce Fields, Frank + Lichtenheld, Alex Riesen and others. Andrew Ruder started a + war on undocumented options. + +--- +exec >/var/tmp/1 +O=v1.5.1.1-31-g0220f1e +echo O=`git describe refs/heads/maint` +git shortlog --no-merges $O..refs/heads/maint diff --git a/RelNotes-1.5.2.txt b/RelNotes-1.5.2.txt index 2e3c7bc4f..d93da608c 100644 --- a/RelNotes-1.5.2.txt +++ b/RelNotes-1.5.2.txt @@ -9,6 +9,14 @@ Updates since v1.5.1 - "git bisect start" can optionally take a single bad commit and zero or more good commits on the command line. + - "git shortlog" can optionally be told to wrap its output. + + - "subtree" merge strategy allows another project to be merged in as + your subdirectory. + + - "git format-patch" learned a new --subject-prefix= + option, to override the built-in "[PATCH]". + * Updated behavior of existing commands. - "git diff --stat" shows size of preimage and postimage blobs @@ -27,6 +35,12 @@ Updates since v1.5.1 the root commit). We used to refuse to operate without a good and a bad commit. + - "git push", when pushing into more than one repository, does + not stop at the first error. + + - "git archive" does not insist you to give --format parameter + anymore; it defaults to "tar". + * Builds - git-p4import has never been installed; now there is an @@ -55,8 +69,30 @@ The following are all in v1.5.1.x series, unless otherwise noted. * Documentation updates + - Various documentation updates from J. Bruce Fields, Frank + Lichtenheld, Alex Riesen and others. Andrew Ruder started a + war on undocumented options. + * Bugfixes + - "git diff a/ b/" incorrectly fell in "diff between two + filesystem objects" codepath, when the user most likely + wanted to limit the extent of output to two tracked + directories. + + - git-quiltimport had the same bug as we fixed for + git-applymbox in v1.5.1.1 -- it gave an alarming "did not + have any patch" message (but did not actually fail and was + harmless). + + - various git-svn fixes. + + - Sample update hook incorrectly always refused requests to + delete branches through push. + + - git-blame on a very long working tree path had buffer + overrun problem. + - Switching branches with "git checkout" refused to work when a path changes from a file to a directory between the current branch and the new branch, in order not to lose @@ -67,10 +103,17 @@ The following are all in v1.5.1.x series, unless otherwise noted. been backported to 1.5.1.x series, as it is rather an intrusive change. + - Merging branches that have a file in one and a directory in + another at the same path used to get quite confused. We + handle such a case a bit more carefully, even though that is + still left as a conflict for the user to sort out. This + will not be backported to 1.5.1.x series, as it is rather an + intrusive change. + * Performance Tweaks -- exec >/var/tmp/1 -O=v1.5.1-91-g640ee0d +O=v1.5.1.1-158-g86da9de echo O=`git describe refs/heads/master` git shortlog --no-merges $O..refs/heads/master ^refs/heads/maint diff --git a/git-rm.html b/git-rm.html index 795fe544d..65b7e3ee3 100644 --- a/git-rm.html +++ b/git-rm.html @@ -272,7 +272,7 @@ git-rm(1) Manual Page

SYNOPSIS

-

git-rm [-f] [-n] [-r] [--cached] [--] <file>…

+

git-rm [-f] [-n] [-r] [--cached] [--ignore-unmatch] [--quiet] [--] <file>…

DESCRIPTION

@@ -343,6 +343,14 @@ area (aka index).

+--ignore-unmatch +
+
+

+ Exit with a zero status even if no files matched. +

+
+
--quiet
@@ -406,7 +414,7 @@ git-rm -f git-*.sh
diff --git a/git-rm.txt b/git-rm.txt index b051ccb6d..a65f24a0f 100644 --- a/git-rm.txt +++ b/git-rm.txt @@ -7,7 +7,7 @@ git-rm - Remove files from the working tree and from the index SYNOPSIS -------- -'git-rm' [-f] [-n] [-r] [--cached] [--] ... +'git-rm' [-f] [-n] [-r] [--cached] [--ignore-unmatch] [--quiet] [--] ... DESCRIPTION ----------- @@ -47,6 +47,9 @@ OPTIONS the paths only from the index, leaving working tree files. +\--ignore-unmatch:: + Exit with a zero status even if no files matched. + \--quiet:: git-rm normally outputs one line (in the form of an "rm" command) for each file removed. This option suppresses that output.