Git merge flattening

“git merge –squash” (after “git fetch”; “git pull” is just fetch+merge, pehaps it also allows –squash option) might be what you want.

From git-merge(1):

–squash

Produce the working tree and index state as if a real merge happened, but do not actually make a commit or move the HEAD, nor record $GIT_DIR/MERGE_HEAD to cause the next git commit command to create a merge commit. This allows you to create a single commit on top of the current branch whose effect is the same as merging another branch (or more in case of an octopus).