John Keeping writes:
> Here is that patch. The test changes here are all reverting changes in
> ae2dab2 (pull: require choice between rebase/merge on non-fast-forward
> pull, 2013-06-27) - with this change to git-pull.sh the only change
> needed in the tests is in t5524-pull-msg:
>
> $ git d
---
On Fri, Jun 28, 2013 at 03:41:34PM -0700, Junio C Hamano wrote:
> John Keeping writes:
> > I don't think "git pull remote branch" falls into the same category as
> > plain "git pull" so I'm not convinced that defaulting to merge there is
> > unreasonable. The original message about this [1] d
2 matches
Mail list logo
