gpull & gpush: refactored and preserving feature branch merge commits.