diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-08-08 12:24:16 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-08-08 12:24:16 -0700 |
| commit | fca64c80fb61147215de89c2f9391ea0f5576b35 (patch) | |
| tree | c96e6ba8440ee4a5865381a550c47f0766a3d276 /Documentation | |
| parent | e7a85be3cfc4ee017f59f1d1f8ceb63d7c88c9c8 (diff) | |
| parent | 0906f6e14e6e9df0c4ea4edb08ebe9f5d16c2391 (diff) | |
| download | git-fca64c80fb61147215de89c2f9391ea0f5576b35.tar.gz git-fca64c80fb61147215de89c2f9391ea0f5576b35.tar.xz | |
Merge branch 'maint'
* maint:
filter-branch: Export variable `workdir' for --commit-filter
Documentation/Makefile: add *.pdf to `clean' target
Documentation: ignore *.pdf files
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/.gitignore | 1 | ||||
| -rw-r--r-- | Documentation/Makefile | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/.gitignore b/Documentation/.gitignore index 1c3a9fead..d62aebd84 100644 --- a/Documentation/.gitignore +++ b/Documentation/.gitignore @@ -3,6 +3,7 @@ *.[1-8] *.made *.texi +*.pdf git.info gitman.info howto-index.txt diff --git a/Documentation/Makefile b/Documentation/Makefile index 36989b7f6..18c71d763 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -232,6 +232,7 @@ cmd-list.made: cmd-list.perl ../command-list.txt $(MAN1_TXT) clean: $(RM) *.xml *.xml+ *.html *.html+ *.1 *.5 *.7 $(RM) *.texi *.texi+ *.texi++ git.info gitman.info + $(RM) *.pdf $(RM) howto-index.txt howto/*.html doc.dep $(RM) technical/api-*.html technical/api-index.txt $(RM) $(cmds_txt) *.made |