From: Kristoffer Haugsbakk <kristofferhaugsbakk@fastmail.com>
Date: Mon, 07 Oct 2024 15:23:27 GMT
Subject: Re: [PATCH 1/3] doc: merge-tree: provide a commit message
Message-ID: <2fe12309-7b5b-487b-bcf4-0639a1dc610d@app.fastmail.com>
In-Reply-To: <CABPp-BHoYSmxCDDXhC8MGxGV+wzaNc96Fbv60JAbhgX9O_x7oQ@mail.gmail.com>

On Mon, Oct 7, 2024, at 17:17, Elijah Newren wrote:
>>         NEWTREE=$(git merge-tree --write-tree $BRANCH1 $BRANCH2)
>>         test $? -eq 0 || die "There were conflicts..."
>> -       NEWCOMMIT=$(git commit-tree $NEWTREE -p $BRANCH1 -p $BRANCH2)
>> +       NEWCOMMIT=$(git commit-tree $NEWTREE -mMerge -p $BRANCH1 -p $BRANCH2)
>
> ...perhaps this can be -F ${FILE_WITH_COMMIT_MESSAGE} ?  I personally
> have a problem with writing example code that models horrible commit
> messages; I'd rather give them an example that hangs waiting on stdin
> than do that.

Yes.  I’ll do that in the reroll.

Both this part and the uppercase variables.

Cheers

-- 
Kristoffer Haugsbakk