Skip to content

Commit

Permalink
Merge branch 'maint'
Browse files Browse the repository at this point in the history
* maint:
  Prepare for 1.7.6.3 maintenance release
  SubmittingPathces: remove Cogito reference

Conflicts:
	RelNotes
  • Loading branch information
Junio C Hamano committed Sep 12, 2011
2 parents 3793ac5 + c2d5358 commit 2f9e2e7
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 2 deletions.
20 changes: 20 additions & 0 deletions Documentation/RelNotes/1.7.6.3.txt
Original file line number Diff line number Diff line change
@@ -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.
3 changes: 1 addition & 2 deletions Documentation/SubmittingPatches
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 2f9e2e7

Please sign in to comment.