It's more that feature branches should be rebased instead of merging the main branch into it (like most developers unfortunately do)

    [pull]
        rebase = true

in your ~/.gitconfig, and just pull the branch your forked from

This way, the git history is linear, clean and readable