mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
Merge branch 'maint'
* maint: filter-branch: Export variable `workdir' for --commit-filter Documentation/Makefile: add *.pdf to `clean' target Documentation: ignore *.pdf files
This commit is contained in:
commit
fca64c80fb
1
Documentation/.gitignore
vendored
1
Documentation/.gitignore
vendored
|
@ -3,6 +3,7 @@
|
|||
*.[1-8]
|
||||
*.made
|
||||
*.texi
|
||||
*.pdf
|
||||
git.info
|
||||
gitman.info
|
||||
howto-index.txt
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -363,7 +363,7 @@ while read commit parents; do
|
|||
sed -e '1,/^$/d' <../commit | \
|
||||
eval "$filter_msg" > ../message ||
|
||||
die "msg filter failed: $filter_msg"
|
||||
@SHELL_PATH@ -c "$filter_commit" "git commit-tree" \
|
||||
workdir=$workdir @SHELL_PATH@ -c "$filter_commit" "git commit-tree" \
|
||||
$(git write-tree) $parentstr < ../message > ../map/$commit ||
|
||||
die "could not write rewritten commit"
|
||||
done <../revs
|
||||
|
|
Loading…
Reference in a new issue