Junio C Hamano 25c4f61c51 Merge branch 'maint' ...

* maint:
  templates/Makefile: don't depend on local umask setting
  Correct name of diff_flush() in API documentation
  Start preparing for 1.5.4.4

Conflicts:

	RelNotes

2008-02-29 00:00:09 -08:00

..

.gitignore

…

branches--

…

hooks--applypatch-msg

…

hooks--commit-msg

git-commit: add a prepare-commit-msg hook

2008-02-06 02:26:55 -08:00

hooks--post-commit

…

hooks--post-receive

War on whitespace

2007-06-07 00:04:01 -07:00

hooks--post-update

…

hooks--pre-applypatch

War on whitespace

2007-06-07 00:04:01 -07:00

hooks--pre-commit

Make default pre-commit hook less noisy

2008-01-14 13:52:27 -08:00

hooks--pre-rebase

…

hooks--prepare-commit-msg

git-commit: add a prepare-commit-msg hook

2008-02-06 02:26:55 -08:00

hooks--update

Officially deprecate repo-config.

2008-01-17 22:52:40 -08:00

info--exclude

…

Makefile

templates/Makefile: don't depend on local umask setting

2008-02-28 13:36:50 -08:00

this--description

…