Add exec-path-from-shell
Add aliases for displaying all the commits between a tag and another tag.
Resolve conflict.