Re: [PATCH] pull: warn if the user didn't say whether to rebase or to merge

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Fri, Feb 28, 2020 at 03:16:01PM -0800, Junio C Hamano wrote:
> > To
> > avoid that situation, Git should require users to explicitly specify
> > whether their primary workflow is a contributor/rebasing workflow or a
> > maintainer/merging workflow.
> 
> There is nothing Git "should" do.  There are things we wish Git did,
> and we give orders to the codebase to do so in our proposed log
> message.  Perhaps like:

I'd also note that there are some workflows that assume that --rebase
is *never* a good thing, even for contributors.  We can decide whether
we want to bias the git man page in favor of one workflow as opposed
to another, for the sake of new git users, but I don't think it's
accurate to say (or even imply) that there are only two workflows:
contributor/rebasing and maintainer/merging.

							- Ted



[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux