diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-09-11 22:35:11 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-09-11 22:35:11 -0700 |
| commit | 2f9e2e75874e0f0722382106e2e189cc3f95cc7d (patch) | |
| tree | 00b230dee1bc6002817ffc3366a9d6bc7d595599 | |
| parent | RelNotes/1.7.7: minor fixes (diff) | |
| parent | Prepare for 1.7.6.3 maintenance release (diff) | |
| download | tgif-2f9e2e75874e0f0722382106e2e189cc3f95cc7d.tar.xz | |
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.txt | 20 | ||||
| -rw-r--r-- | Documentation/SubmittingPatches | 3 |
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 0000000000..c05efb2439 --- /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 938eccf2a5..0dbf2c9843 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 |