| commit | fb5fd011482b5aa0b340a4a5bd9192c0efc1edb7 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 14 Nov 2007 11:37:18 +0000 (14 03:37 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 14 Nov 2007 11:37:18 +0000 (14 03:37 -0800) | ||
| tree | 1701d97cd2ae3aa4ce52127cf8343b8b1efc9383 | treesnapshot (tar.gz zip) |
| parent | 481424e1f100de690849a9f0348fc78f45ab815e | commitdiff |
| parent | b57321f57b324320bdcf9f453ec4788da166f8f4 | commitdiff |
Merge branch 'maint'
* maint:
git-clean: honor core.excludesfile
Documentation: Fix man page breakage with DocBook XSL v1.72
git-remote.txt: fix typo
core-tutorial.txt: Fix argument mistake in an example.
replace reference to git-rm with git-reset in git-commit doc
Grammar fixes for gitattributes documentation
Don't allow fast-import tree delta chains to exceed maximum depth
revert/cherry-pick: allow starting from dirty work tree.
t/t3404: fix test for a bogus todo file.
Conflicts:
fast-import.c
* maint:
git-clean: honor core.excludesfile
Documentation: Fix man page breakage with DocBook XSL v1.72
git-remote.txt: fix typo
core-tutorial.txt: Fix argument mistake in an example.
replace reference to git-rm with git-reset in git-commit doc
Grammar fixes for gitattributes documentation
Don't allow fast-import tree delta chains to exceed maximum depth
revert/cherry-pick: allow starting from dirty work tree.
t/t3404: fix test for a bogus todo file.
Conflicts:
fast-import.c