diff options
| -rw-r--r-- | Documentation/RelNotes-1.6.2.2.txt | 35 | ||||
| -rw-r--r-- | Documentation/RelNotes-1.6.3.txt | 19 | ||||
| -rw-r--r-- | Documentation/git-format-patch.txt | 1 | ||||
| -rw-r--r-- | builtin-log.c | 2 |
4 files changed, 35 insertions, 22 deletions
diff --git a/Documentation/RelNotes-1.6.2.2.txt b/Documentation/RelNotes-1.6.2.2.txt new file mode 100644 index 000000000..28bfa5399 --- /dev/null +++ b/Documentation/RelNotes-1.6.2.2.txt @@ -0,0 +1,35 @@ +GIT v1.6.2.2 Release Notes +========================== + +Fixes since v1.6.2.1 +-------------------- + +* A longstanding confusing description of what --pickaxe option of + git-diff does has been clarified in the documentation. + +* "git diff --pickaxe-regexp" did not count overlapping matches + correctly. + +* "git-fetch" in a repository that was not cloned from anywhere said + it cannot find 'origin', which was hard to understand for new people. + +* "git-format-patch --numbered-files --stdout" did not have to die of + incompatible options; it now simply ignores --numbered-files as no files + are produced anyway. + +* "git-ls-files --deleted" did not work well with GIT_DIR&GIT_WORK_TREE. + +* "git-read-tree A B C..." without -m option has been broken for a long + time. + +* git-send-email ignored --in-reply-to when --no-thread was given. + +* 'git-submodule add' did not tolerate extra slashes and ./ in the path it + accepted from the command line; it now is more lenient. + + +--- +exec >/var/tmp/1 +O=v1.6.2.1-23-g67c176f +echo O=$(git describe maint) +git shortlog --no-merges $O..maint diff --git a/Documentation/RelNotes-1.6.3.txt b/Documentation/RelNotes-1.6.3.txt index 4353cbf8c..5860b515f 100644 --- a/Documentation/RelNotes-1.6.3.txt +++ b/Documentation/RelNotes-1.6.3.txt @@ -104,28 +104,9 @@ release, unless otherwise noted. Here are fixes that this release has, but have not been backported to v1.6.2.X series. -* "git diff --pickaxe-regexp" did not count overlapping matches - correctly (backport by cherry-picking 50fd699). - -* "git-fetch" in a repository that was not cloned from anywhere said - it cannot find 'origin', which was hard to understand for new people. - * git-gc spent excessive amount of time to decide if an object appears in a locally existing pack (if needed, backport by merging 69e020a). -* "git-ls-files --deleted" did not work well with GIT_DIR&GIT_WORK_TREE - (backport by cherry-picking 8ad3dae). - -* "git-read-tree A B C..." without -m option has been broken for a long time - (backport by merging jc/maint-1.6.0-read-tree-overlay) - -* 'git-submodule add' did not tolerate extra slashes and ./ in the - path it accepted from the command line; it now is more lenient - (if needed, backport by merging db75ada). - -* git-send-email ignored --in-reply-to when --no-thread was given - (backport by merging tr/maint-1.6.0-send-email-irt) - --- exec >/var/tmp/1 O=v1.6.2.1-213-g7d4e3a7 diff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt index c14e3ee39..c2eb5fab4 100644 --- a/Documentation/git-format-patch.txt +++ b/Documentation/git-format-patch.txt @@ -97,7 +97,6 @@ include::diff-options.txt[] --numbered-files:: Output file names will be a simple number sequence without the default first line of the commit appended. - Mutually exclusive with the --stdout option. -k:: --keep-subject:: diff --git a/builtin-log.c b/builtin-log.c index 8af55d287..c7a577259 100644 --- a/builtin-log.c +++ b/builtin-log.c @@ -958,8 +958,6 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix) die ("-n and -k are mutually exclusive."); if (keep_subject && subject_prefix) die ("--subject-prefix and -k are mutually exclusive."); - if (numbered_files && use_stdout) - die ("--numbered-files and --stdout are mutually exclusive."); argc = setup_revisions(argc, argv, &rev, "HEAD"); if (argc > 1) |