Re: [PATCH v6 4/7] pull: add --merge option

2014-05-02 Thread brian m. carlson
On Thu, May 01, 2014 at 09:41:34PM -0500, Felipe Contreras wrote: brian m. carlson wrote: On Thu, May 01, 2014 at 07:00:05PM -0500, Felipe Contreras wrote: Also, deprecate --no-rebase since there's no need for it any more. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com

Re: [PATCH v6 4/7] pull: add --merge option

2014-05-02 Thread Felipe Contreras
brian m. carlson wrote: My point is that it's unclear to me what options I need to use to retain the current behavior (fast-forward if possible, merge otherwise) without a warning. The current behavior is to always merge (ff or otherwise), just what `git merge` would do, so `git pull --merge`.

Re: [PATCH v6 4/7] pull: add --merge option

2014-05-02 Thread brian m. carlson
On Fri, May 02, 2014 at 03:14:44PM -0500, Felipe Contreras wrote: brian m. carlson wrote: My point is that it's unclear to me what options I need to use to retain the current behavior (fast-forward if possible, merge otherwise) without a warning. The current behavior is to always merge

[PATCH v6 4/7] pull: add --merge option

2014-05-01 Thread Felipe Contreras
Also, deprecate --no-rebase since there's no need for it any more. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- Documentation/git-pull.txt | 8 ++-- git-pull.sh| 10 +- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git

Re: [PATCH v6 4/7] pull: add --merge option

2014-05-01 Thread brian m. carlson
On Thu, May 01, 2014 at 07:00:05PM -0500, Felipe Contreras wrote: Also, deprecate --no-rebase since there's no need for it any more. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- Documentation/git-pull.txt | 8 ++-- git-pull.sh| 10 +- 2 files

Re: [PATCH v6 4/7] pull: add --merge option

2014-05-01 Thread Felipe Contreras
brian m. carlson wrote: On Thu, May 01, 2014 at 07:00:05PM -0500, Felipe Contreras wrote: Also, deprecate --no-rebase since there's no need for it any more. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- Documentation/git-pull.txt | 8 ++-- git-pull.sh