From: Bagas Sanjaya Date: Sat, 16 Oct 2021 05:16:29 GMT Subject: Re: [PATCH v2] Documentation: specify base point when generating MyFirstContribution patchset Message-ID: <35ccb414-c0fe-ab3a-21aa-ac7b1338df6a@gmail.com> In-Reply-To: On 16/10/21 00.06, Glen Choo wrote: > This reads quite awkwardly because a few lines above, we already tell > the reader exactly what commands to run: > > Sending emails with Git is a two-part process; before you can prepare the emails > themselves, you'll need to prepare the patches. Luckily, this is pretty simple: > > ---- > $ git format-patch --cover-letter -o psuh/ master..psuh > ---- > > If we do accept this suggestion (and I am not sure if we should, because > as Junio said, there are strong conventions for determining the branch > point), I think this would be easier to follow if we incorporate it into > the existing instructions. Something like.. > > Sending emails with Git is a two-part process; before you can prepare the emails > themselves, you'll need to prepare the patches. Luckily, this is > pretty simple. First, we'll get the hash of the commit the patchset is > based on. We call this commit the 'base'. > > ---- > $ git show -s --format="%H" master > ---- > > Now, we'll generate the patches, passing the hash of the 'base' to the > --base option. > > ---- > $ git format-patch --cover-letter --base= -o psuh/ master..psuh > ---- > > [...describe --base= the way we describe the other options]. > Actually it is up to contributors whether they want to include `--base` or not. -- An old man doll... just what I always wanted! - Clara