diff options
author | Junio C Hamano <gitster@pobox.com> | 2007-11-14 03:37:18 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2007-11-14 03:37:18 -0800 |
commit | fb5fd011482b5aa0b340a4a5bd9192c0efc1edb7 (patch) | |
tree | 1701d97cd2ae3aa4ce52127cf8343b8b1efc9383 /Documentation/git-archimport.txt | |
parent | Fix dependencies of parse-options test program (diff) | |
parent | git-clean: honor core.excludesfile (diff) | |
download | tgif-fb5fd011482b5aa0b340a4a5bd9192c0efc1edb7.tar.xz |
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
Diffstat (limited to 'Documentation/git-archimport.txt')
0 files changed, 0 insertions, 0 deletions