diff options
| author | hut <hut@lavabit.com> | 2010-04-07 15:50:08 +0200 |
|---|---|---|
| committer | hut <hut@lavabit.com> | 2010-04-07 15:50:08 +0200 |
| commit | 8d89c6f3a7cf6b0c8abc2ff68ecc7201ac08e872 (patch) | |
| tree | 610dd3acfdac10ebe1d766a779897207ea6dfb33 /Makefile | |
| parent | 55435343b142c424619e3072475ca8b3366d109c (diff) | |
| parent | f45f9734d2ff9fd6b68ff6c879d5b07b0e5c7d02 (diff) | |
| download | ranger-8d89c6f3a7cf6b0c8abc2ff68ecc7201ac08e872.tar.gz | |
Merge branch 'devel' into newkey
Conflicts: ranger/core/actions.py ranger/defaults/keys.py ranger/ext/direction.py ranger/gui/ui.py ranger/gui/widgets/browserview.py ranger/gui/widgets/pager.py
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/Makefile b/Makefile index ac7b0502..05c565e6 100644 --- a/Makefile +++ b/Makefile @@ -71,10 +71,10 @@ cleandoc: test -d $(DOCDIR) && rm -f -- $(DOCDIR)/*.html clean: - find . -regex [^\s]\*.py[co]$ | xargs rm -f -- + find . -regex .\*.py[co]\$$ -exec rm -f -- {} \; test: - ./all_tests.py + ./all_tests.py 1 edit: @$(EDITOR) ranger.py Makefile README COPYING HACKING INSTALL $(shell find ranger test -regex .\*py$ ) @@ -89,16 +89,4 @@ commit: test @git citool snapshot: - git archive HEAD | gzip > $(NAME)-$(VERSION)-$(shell git rev-list HEAD | head -n 1 | cut -b 1-8).tar.gz - -minimal_snapshot: - @echo 'This is not quite working well. I will abort now' && false - git checkout -b no_help - git rm -rf doc - git rm -rf test - git rm all_tests.py - git rm TODO - git commit -a -m'removed documentation' - git archive HEAD | gzip > $(NAME)-$(VERSION)-$(shell git rev-list HEAD | head -n 1 | cut -b 1-8).tar.gz - git reset --hard no_help^ - git branch -D no_help + git archive HEAD | gzip > $(NAME)-$(VERSION)-$(shell git rev-parse HEAD | cut -b 1-8).tar.gz |