On Tue, Jun 04, 2019 at 01:08:37PM -0600, Jonathan Corbet wrote:
> On Sat, 1 Jun 2019 11:42:48 -0400
> "Theodore Ts'o" wrote:
>
> > Finally, I'm bit concerned about anything which states absolutes,
> > because there are people who tend to be real stickler for the rules,
> > and if they see someth
Hi Jon,
On Tue, Jun 4, 2019 at 9:09 PM Jonathan Corbet wrote:
> On Sat, 1 Jun 2019 11:42:48 -0400
> "Theodore Ts'o" wrote:
> > Finally, I'm bit concerned about anything which states absolutes,
> > because there are people who tend to be real stickler for the rules,
> > and if they see something
On Sat, 1 Jun 2019 11:42:48 -0400
"Theodore Ts'o" wrote:
> Finally, I'm bit concerned about anything which states absolutes,
> because there are people who tend to be real stickler for the rules,
> and if they see something stated in absolute terms, they fail to
> understand that there are except
Hi Jon,
On Thu, May 30, 2019 at 9:54 PM Jonathan Corbet wrote:
> This is a first attempt at following through on last month's discussion
> about common merging and rebasing errors. The hope here is to document
> existing best practices rather than trying to define new ones. I've
> certainly fai
On Thu, May 30, 2019 at 01:53:17PM -0600, Jonathan Corbet wrote:
> +Rebasing
> +
> +
> +"Rebasing" is the process of changing the history of a series of commits
> +within a repository. At its simplest, a rebase could change the starting
> +point of a patch series from one point to another.
On 5/31/19 4:36 PM, Jonathan Corbet wrote:
> On Thu, 30 May 2019 17:45:23 -0700
> Randy Dunlap wrote:
>
>> On 5/30/19 12:53 PM, Jonathan Corbet wrote:
>>> + git merge v5.2-rc1^0
>>
>> That line is presented in my email client (Thunderbird) as
>>
>> git merge v5.2-rc1{superscript 0}
>>
>>
On Thu, 30 May 2019 17:45:23 -0700
Randy Dunlap wrote:
> On 5/30/19 12:53 PM, Jonathan Corbet wrote:
> > + git merge v5.2-rc1^0
>
> That line is presented in my email client (Thunderbird) as
>
> git merge v5.2-rc1{superscript 0}
>
> Could you escape/quote it to prevent that?
So I'm a
On Thu, 30 May 2019, Jonathan Corbet wrote:
> docs: Add a document on repository management
>
> Every merge window seems to involve at least one episode where subsystem
> maintainers don't manage their trees as Linus would like. Document the
> expectations so that at least he has something to po
On Thu, May 30, 2019 at 12:53 PM Jonathan Corbet wrote:
>
> This is a first attempt at following through on last month's discussion
> about common merging and rebasing errors.
Looks good to me,
Linus
On 5/30/19 12:53 PM, Jonathan Corbet wrote:
> + git merge v5.2-rc1^0
That line is presented in my email client (Thunderbird) as
git merge v5.2-rc1{superscript 0}
Could you escape/quote it to prevent that?
> +
> +The "^0" will cause Git to do a fast-forward merge (which should be
> +possib
This is a first attempt at following through on last month's discussion
about common merging and rebasing errors. The hope here is to document
existing best practices rather than trying to define new ones. I've
certainly failed somewhere along the way; please set me straight and I'll
try to do be
11 matches
Mail list logo
