summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-09-12 05:35:11 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-09-12 05:35:11 (GMT)
commit2f9e2e75874e0f0722382106e2e189cc3f95cc7d (patch)
tree00b230dee1bc6002817ffc3366a9d6bc7d595599
parent3793ac56b4c4f9bf0bddc306a0cec21118683728 (diff)
parentc2d53586ddfdde1ff625fe58299dc81db5e6f408 (diff)
downloadgit-2f9e2e75874e0f0722382106e2e189cc3f95cc7d.zip
git-2f9e2e75874e0f0722382106e2e189cc3f95cc7d.tar.gz
git-2f9e2e75874e0f0722382106e2e189cc3f95cc7d.tar.bz2
Merge branch 'maint'
* maint: Prepare for 1.7.6.3 maintenance release SubmittingPathces: remove Cogito reference Conflicts: RelNotes
-rw-r--r--Documentation/RelNotes/1.7.6.3.txt20
-rw-r--r--Documentation/SubmittingPatches3
2 files changed, 21 insertions, 2 deletions
diff --git a/Documentation/RelNotes/1.7.6.3.txt b/Documentation/RelNotes/1.7.6.3.txt
new file mode 100644
index 0000000..c05efb2
--- /dev/null
+++ b/Documentation/RelNotes/1.7.6.3.txt
@@ -0,0 +1,20 @@
+Git v1.7.6.3 Release Notes
+==========================
+
+Fixes since v1.7.6.2
+--------------------
+
+ * "git -c var=value subcmd" misparsed the custom configuration when
+ value contained an equal sign.
+
+ * "git reflog $refname" did not default to the "show" subcommand as
+ the documentation advertised the command to do.
+
+ * "git reset" did not leave meaningful log message in the reflog.
+
+ * "git status --ignored" did not show ignored items when there is no
+ untracked items.
+
+ * "git tag --contains $commit" was unnecessarily inefficient.
+
+Also contains minor fixes and documentation updates.
diff --git a/Documentation/SubmittingPatches b/Documentation/SubmittingPatches
index 938eccf..0dbf2c9 100644
--- a/Documentation/SubmittingPatches
+++ b/Documentation/SubmittingPatches
@@ -134,8 +134,7 @@ Another thing: NULL pointers shall be written as NULL, not as 0.
(2) Generate your patch using git tools out of your commits.
-git based diff tools (git, Cogito, and StGIT included) generate
-unidiff which is the preferred format.
+git based diff tools generate unidiff which is the preferred format.
You do not have to be afraid to use -M option to "git diff" or
"git format-patch", if your patch involves file renames. The