This is more of a git tip... but you should probably change your "ggpnp" alias to use "pull --rebase" instead of "pull" to avoid an unnecessary merge commit in your history.