Commit 5abdbaad authored by Martin's avatar Martin

switched to icdiff

parent 9c4cb926
......@@ -8,7 +8,7 @@ PKG_FILE=$(PKG_NAME)-$(VERSION).deb
dist: src/* debian/*
test -d dist || mkdir dist
test -f 'dist/$(PKG_FILE)' && rm 'dist/$(PKG_FILE)' || true
$(FPM) -t deb --package 'dist/$(PKG_FILE)' --version $(VERSION) --name $(PKG_NAME) --depends 'git' --depends 'bash' --after-install 'debian/postinstall' --before-remove 'debian/preremove' -s dir ./src/=/usr/bin/
$(FPM) -t deb --package 'dist/$(PKG_FILE)' --version $(VERSION) --name $(PKG_NAME) --depends 'git' --depends 'bash' --depends 'icdiff' --after-install 'debian/postinstall' --before-remove 'debian/preremove' -s dir ./src/=/usr/bin/
clean:
test -d dist && rm -rf dist || true
......@@ -4,4 +4,4 @@
git config --system alias.lg "log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit"
git config --system alias.stat "log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --stat"
git config --system alias.d diff
git config --system alias.d icdiff
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment