| commit | c5a00f7ff5becd929d3e3b3e900d0983cd6083af | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 20 Aug 2008 23:36:58 +0000 (20 16:36 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 20 Aug 2008 23:36:58 +0000 (20 16:36 -0700) | ||
| tree | ba0805029360ff0eb6fb68ffcf001b9648803ec7 | treesnapshot (tar.gz zip) |
| parent | 9c756de499240bd9fef9224bdeb73ba0165c8705 | commitdiff |
| parent | ea3594e04184475226109a21e71c539ff5f139fd | commitdiff |
Merge branch 'master' into next
* master:
Update draft release notes for 1.6.1
Update draft release notes for 1.6.0.1
Add hints to revert documentation about other ways to undo changes
Install templates with the user and group of the installing personality
"git-merge": allow fast-forwarding in a stat-dirty tree
completion: find out supported merge strategies correctly
decorate: allow const objects to be decorated
for-each-ref: cope with tags with incomplete lines
diff --check: do not get confused by new blank lines in the middle
remote.c: remove useless if-before-free test
mailinfo: avoid violating strbuf assertion
git format-patch: avoid underrun when format.headers is empty or all NLs
* master:
Update draft release notes for 1.6.1
Update draft release notes for 1.6.0.1
Add hints to revert documentation about other ways to undo changes
Install templates with the user and group of the installing personality
"git-merge": allow fast-forwarding in a stat-dirty tree
completion: find out supported merge strategies correctly
decorate: allow const objects to be decorated
for-each-ref: cope with tags with incomplete lines
diff --check: do not get confused by new blank lines in the middle
remote.c: remove useless if-before-free test
mailinfo: avoid violating strbuf assertion
git format-patch: avoid underrun when format.headers is empty or all NLs