From 30962fb7fba9a8e57fe34a70bc8abd2e0af8b2ee Mon Sep 17 00:00:00 2001 From: Sverre Rabbelier <srabbelier@gmail.com> Date: Sun, 11 Sep 2011 14:38:10 +0200 Subject: [PATCH 1/2] SubmittingPathces: remove Cogito reference Removing Cogito leaves just git and StGit, which is a rather incomplete list of git diff tools available. Sidestep the problem of deciding what tools to mention by not mentioning any. Signed-off-by: Sverre Rabbelier <srabbelier@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> --- Documentation/SubmittingPatches | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Documentation/SubmittingPatches b/Documentation/SubmittingPatches index 938eccf2a5a..0dbf2c9843d 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 From c2d53586ddfdde1ff625fe58299dc81db5e6f408 Mon Sep 17 00:00:00 2001 From: Junio C Hamano <gitster@pobox.com> Date: Sun, 11 Sep 2011 22:08:56 -0700 Subject: [PATCH 2/2] Prepare for 1.7.6.3 maintenance release Signed-off-by: Junio C Hamano <gitster@pobox.com> --- Documentation/RelNotes/1.7.6.3.txt | 20 ++++++++++++++++++++ RelNotes | 2 +- 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 Documentation/RelNotes/1.7.6.3.txt diff --git a/Documentation/RelNotes/1.7.6.3.txt b/Documentation/RelNotes/1.7.6.3.txt new file mode 100644 index 00000000000..c05efb24390 --- /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/RelNotes b/RelNotes index c301f4c580d..695f126692a 120000 --- a/RelNotes +++ b/RelNotes @@ -1 +1 @@ -Documentation/RelNotes/1.7.6.2.txt \ No newline at end of file +Documentation/RelNotes/1.7.6.3.txt \ No newline at end of file