A git alias for smart reversions

smart_revert.gitconfig

# 'Smart Revert'

# Uses git reset to perform a revert such that:
# - Git history stays intact
# - Works across merge commits

# See this stack overflow answer for information on the solution:
# https://stackoverflow.com/a/1470452

# This takes a single argument: a git commit. Note: this can be either
# an exact commit, or some expression such as 'HEAD^'

[alias]
sr = "!f() { \
	COMMIT=$(git log -1 --format='format:%H' $1); \
	ORIG_COMMIT=$(git log -1 --format='format:%H'); \
	git reset --hard ${COMMIT}; \
	git reset --soft ${ORIG_COMMIT}; \
	git add .; \
	git commit -am 'Reverting changes between '${ORIG_COMMIT}' and '${COMMIT}''; \
}; f"