Hey, Following up on an old thread (2008): http://git.661346.n2.nabble.com/pull-preserve-merges-td1471688.html I'd like to finally add a config parameter/setting to allow git pull to preserve merges when it's rebasing. This addresses a somewhat common boundary case of a locally merged feature branch getting flattened into master, as described here: http://notes.envato.com/developers/rebasing-merge-commits-in-git/ This current patch adds a new `pull.preserve-merges` boolean config setting, but we could also change the existing `pull.rebase` to be tri-state (so `pull.rebase` can be true, false, or preserve-merges), or add a more generic `pull.rebaseoptions` that is just a string of flags to pass to rebase. Any of these would be fine with me--what would be preferred? This patch doesn't update the docs, but I wanted to get an initial sanity check on the preferred config setting before doing that. Thanks! - Stephen Stephen Haberman (1): pull: Allow pull to preserve merges when rebasing. git-pull.sh | 11 +++++++++-- t/t5520-pull.sh | 15 +++++++++++++++ 2 files changed, 24 insertions(+), 2 deletions(-) -- 1.8.1.2 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html