diff --git a/Makefile b/Makefile index 541120d..ae66383 100644 --- a/Makefile +++ b/Makefile @@ -309,7 +309,7 @@ endif $(git_conf) alias.st "status -s -b" $(git_conf) alias.b "branch" $(git_conf) alias.sb "show-branch" - $(git_conf) alias.ci "commit --verbose" + $(git_conf) alias.ci "commit --verbose --allow-empty" # TODO: Try rebase --interactive --autosquash $(git_conf) alias.cf "commit --verbose --fixup=HEAD -m WIP" $(git_conf) alias.co "checkout" @@ -333,7 +333,8 @@ endif $(git_conf) alias.todo "grep -nH -E -i 'todo:|note:|fixme:'" $(git_conf) alias.stashsnap '! gitdir="`git rev-parse --git-dir`" && : >>"$$gitdir"/logs/refs/snapshot && cmt=`git stash create` && test -n "$$cmt" && git update-ref refs/snapshot $$cmt && echo Snapshot created: $$cmt' - $(git_conf) alias.snap '! gitdir="`git rev-parse --git-dir`" && export GIT_INDEX_FILE="$$gitdir"/snapshot.index && cp -pf "$$gitdir"/index "$$GIT_INDEX_FILE" && git add -Av && : >>"$$gitdir"/logs/refs/snapshot && git update-ref refs/snapshot $$(git commit-tree $$(git write-tree) -m Snapshot -p HEAD) && git show --stat snapshot' + #$(git_conf) alias.snap '! gitdir="`git rev-parse --git-dir`" && export GIT_INDEX_FILE="$$gitdir"/snapshot.index && cp -pf "$$gitdir"/index "$$GIT_INDEX_FILE" && git add -Av && : >>"$$gitdir"/logs/refs/snapshot && git update-ref refs/snapshot $$(git commit-tree $$(git write-tree) -m Snapshot -p HEAD) && git show --stat snapshot' + $(git_conf) alias.snap snapshot $(git_conf) alias.setcmd '! f(){ git config alias.$$1 "! $$2"; }; f' $(git_conf) alias.make '!make'