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

diff --cc Documentation/core-tutorial.txt
Simple merge

diff --cc Documentation/git-add.txt
Simple merge

diff --cc Documentation/git-remote.txt
Simple merge

diff --cc Documentation/gitattributes.txt
Simple merge

diff --cc Makefile
Simple merge

diff --cc builtin-revert.c
Simple merge

diff --cc fast-import.c
index f93d7d6c9bf2db021ceb65766da87af32aecc1d1,5e83296bf49f9b41b019185539cbd4ec1bf94513..98c2bd535957a45e5ef189875859d4788d937e7e
--- 1/fast-import.c
--- 2/fast-import.c
+++ b/fast-import.c
@@@ -1095,9 -1120,8 +1098,8 @@@ static int store_object
                write_or_die(pack_data->pack_fd, hdr + pos, sizeof(hdr) - pos);
                pack_size += sizeof(hdr) - pos;
        } else {
-               if (last)
-                       last->depth = 0;
+               e->depth = 0;
 -              hdrlen = encode_header(type, datlen, hdr);
 +              hdrlen = encode_header(type, dat->len, hdr);
                write_or_die(pack_data->pack_fd, hdr, hdrlen);
                pack_size += hdrlen;
        }
@@@ -1108,12 -1132,12 +1110,13 @@@
        free(out);
        free(delta);
        if (last) {
 -              if (!last->no_free)
 -                      free(last->data);
 -              last->data = dat;
 +              if (last->no_swap) {
 +                      last->data = *dat;
 +              } else {
 +                      strbuf_swap(&last->data, dat);
 +              }
                last->offset = e->offset;
 -              last->len = datlen;
+               last->depth = e->depth;
        }
        return 0;
  }

diff --cc git-clean.sh
Simple merge

diff --cc t/t3404-rebase-interactive.sh
Simple merge

diff --cc t/t7300-clean.sh
Simple merge