lkml.org 
[lkml]   [2022]   [Mar]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
SubjectRe: [PATCH v2] docs: Add a document on how to fix a messy diffstat
From
On 29/03/22 22.37, Jonathan Corbet wrote:
> +So what is to be done? The best response when confronted with this
> +situation is to indeed to do a merge with the branch you intend your work
> +to be pulled into, but to do it privately, as if it were the source of
> +shame. Create a new, throwaway branch and do the merge there::
> +
> + ... vM --- vN-rc1 --- vN-rc2 --- vN-rc3 --- ... --- vN-rc7 --- vN
> + | | |
> + | +-- c1 --- c2 --- ... --- cN |
> + | / | |
> + +-- x1 --- x2 --- x3 +------------+-- TEMP
> +
> +The merge operation resolves all of the complications resulting from the
> +multiple beginning points, yielding a coherent result that contains only
> +the differences from the mainline branch. Now it will be possible to
> +generate a diffstat with the desired information::
> +
> + $ git diff -C --stat --summary linus..TEMP
> +
> +Save the output from this command, then simply delete the TEMP branch;
> +definitely do not expose it to the outside world. Take the saved diffstat
> +output and edit it into the messy pull request, yielding a result that
> +shows what is really going on. That request can then be sent upstream.

Looks OK.

Reviewed-by: Bagas Sanjaya <bagasdotme@gmail.com>

--
An old man doll... just what I always wanted! - Clara

\
 
 \ /
  Last update: 2022-03-30 07:08    [W:0.173 / U:0.108 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site