I've been using this patch for some time now, and have to say that 'git pull' is much more useable now. The feature is turned off by default so that it doesn't break any existing tests.
[1/3] and [2/3] are simple "while we're there" patches, that are unchanged from the last round. [3/3] is actually fine in this round. I'm embarassed that I sent out the previous round in such a hurry: there were a lot of things wrong with it, as Junio's review pointed out. Ramkumar Ramachandra (3): pull: prefer invoking "git <command>" over "git-<command>" t5521 (pull-options): use test_commit() where appropriate pull: introduce --[no-]autostash and pull.autostash Documentation/config.txt | 5 ++++ Documentation/git-pull.txt | 7 +++++ git-pull.sh | 37 ++++++++++++++++++++++--- t/t5521-pull-options.sh | 67 ++++++++++++++++++++++++++++++++++++++++++++-- 4 files changed, 110 insertions(+), 6 deletions(-) -- 1.8.2.1.392.g6943ea6 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
