Re: [PATCH v2] pull: require choice between rebase/merge on non-fast-forward pull

2014-01-22 Thread Flimm
Has this patch been released yet? -- View this message in context: http://git.661346.n2.nabble.com/first-parent-commit-graph-layout-and-pull-merge-direction-tp7586671p7602383.html Sent from the git mailing list archive at Nabble.com. -- To unsubscribe from this list: send the line unsubscribe

Re: [PATCH v2] pull: require choice between rebase/merge on non-fast-forward pull

2013-07-19 Thread Junio C Hamano
Eric Sunshine sunsh...@sunshineco.com writes: +When `git pull` that does not explicitly specify what branch from +which repository is to be integrated with your history on the +command line, recent Git will refuse to work until you specify how +that integration should happen, either with a

Re: [PATCH v2] pull: require choice between rebase/merge on non-fast-forward pull

2013-07-19 Thread Eric Sunshine
On Fri, Jul 19, 2013 at 12:22 PM, Junio C Hamano gits...@pobox.com wrote: Eric Sunshine sunsh...@sunshineco.com writes: +When `git pull` that does not explicitly specify what branch from +which repository is to be integrated with your history on the +command line, recent Git will refuse to

Re: [PATCH v2] pull: require choice between rebase/merge on non-fast-forward pull

2013-07-19 Thread Junio C Hamano
Eric Sunshine sunsh...@sunshineco.com writes: Dropping the parenthetical comment might improve flow slightly: Without repository or branch on the command line, `git pull` needs to be told how to integrate the changes with your history, via either `--merge` or `--rebase`. With

Re: [PATCH v2] pull: require choice between rebase/merge on non-fast-forward pull

2013-07-19 Thread Eric Sunshine
On Fri, Jul 19, 2013 at 6:20 PM, Junio C Hamano gits...@pobox.com wrote: Eric Sunshine sunsh...@sunshineco.com writes: Dropping the parenthetical comment might improve flow slightly: Without repository or branch on the command line, `git pull` needs to be told how to integrate the

Re: [PATCH v2] pull: require choice between rebase/merge on non-fast-forward pull

2013-07-19 Thread Junio C Hamano
Eric Sunshine sunsh...@sunshineco.com writes: With no repository or branch on the command line, `git pull` needs to be told how to integrate the changes with your history. This can be done via either `--merge` or `--rebase` option, but most people would want to decide which

[PATCH v2] pull: require choice between rebase/merge on non-fast-forward pull

2013-07-18 Thread Junio C Hamano
Because it is so easy to let Git handle automatically a trivial merge with git pull, a person who is new to Git may not realize that the project s/he is interacting with may prefer a rebase workflow. Add a safety valve to fail git pull that does not explicitly specify what branch from which

Re: [PATCH v2] pull: require choice between rebase/merge on non-fast-forward pull

2013-07-18 Thread Eric Sunshine
On Thu, Jul 18, 2013 at 3:35 PM, Junio C Hamano gits...@pobox.com wrote: Add a safety valve to fail git pull that does not explicitly specify what branch from which repository to integrate your history with, when it is neither a fast-forward or already up-to-date, until/unless the user