From: Junio C Hamano <firstname.lastname@example.org> To: Jeff King <email@example.com> Cc: Derrick Stolee <firstname.lastname@example.org>, Philip Oakley <email@example.com>, Derrick Stolee via GitGitGadget <firstname.lastname@example.org>, email@example.com, firstname.lastname@example.org, Derrick Stolee <email@example.com>, "brian m. carlson" <firstname.lastname@example.org>, Johannes Schindelin <Johannes.Schindelin@gmx.de> Subject: Re: [PATCH] revision: --include-diversions adds helpful merges Date: Thu, 09 Apr 2020 11:55:51 -0700 [thread overview] Message-ID: <email@example.com> (raw) In-Reply-To: <20200409182455.GA4166316@coredump.intra.peff.net> (Jeff King's message of "Thu, 9 Apr 2020 14:24:55 -0400") Jeff King <firstname.lastname@example.org> writes: > On Thu, Apr 09, 2020 at 01:20:57PM -0400, Derrick Stolee wrote: > >> In conclusion, I think "--show-pulls" provides the right context for these >> extra merges to show in the history view. It also roots these merges in a >> Git-native name (that also happens to evoke the "pull request" concept that >> is _not_ native to Git). >> >> What do you think? > > Yeah, after reading more of the thread, I think the simplest way to > think about is "keep merges that pulled in something" with the > implication of "(even if the other side didn't touch anything)". Isn't it more like "even if our side didn't touch anything", though? If a merge pulled in something, the other side by definition did something (i.e. what was pulled in); if we did something since they forked, we would have shown the merge without this patch---the only new behaviour we are adding is to show the merge even when our side didn't touch since they forked---so far we never showed that merge, but now with this option we would when we are asked to. I agree that "this is showing pulls" is an easy way to explain. > And "something you pulled" is a sensible way to think of that. So > --show-pulls makes sense to me. Or if we really want to tie it in to > simplification, --no-simplify-pulls. But that's more awkward to type, > and none of the existing simplification options use the word simplify. ;) ;-)
next prev parent reply other threads:[~2020-04-09 18:56 UTC|newest] Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-04-08 1:22 Derrick Stolee via GitGitGadget 2020-04-08 1:30 ` Junio C Hamano 2020-04-08 1:39 ` Derrick Stolee 2020-04-08 15:28 ` Derrick Stolee 2020-04-08 19:46 ` Junio C Hamano 2020-04-08 20:05 ` Jeff King 2020-04-08 20:22 ` Derrick Stolee 2020-04-08 21:35 ` Junio C Hamano 2020-04-08 23:59 ` Derrick Stolee 2020-04-09 0:08 ` Junio C Hamano 2020-04-09 11:52 ` Derrick Stolee 2020-04-09 14:28 ` Philip Oakley 2020-04-09 15:56 ` Junio C Hamano 2020-04-09 17:20 ` Derrick Stolee 2020-04-09 18:24 ` Jeff King 2020-04-09 18:55 ` Junio C Hamano [this message] 2020-04-09 19:21 ` Jeff King 2020-04-08 2:13 ` brian m. carlson 2020-04-08 18:48 ` Jeff King 2020-04-09 0:01 ` [PATCH v2] " Derrick Stolee via GitGitGadget 2020-04-10 12:19 ` [PATCH v3] revision: --show-pulls " Derrick Stolee via GitGitGadget 2020-04-10 20:06 ` Junio C Hamano 2020-04-10 21:43 ` Derrick Stolee
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style List information: http://vger.kernel.org/majordomo-info.html * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --email@example.com \ --firstname.lastname@example.org \ --cc=Johannes.Schindelin@gmx.de \ --email@example.com \ --firstname.lastname@example.org \ --email@example.com \ --firstname.lastname@example.org \ --email@example.com \ --firstname.lastname@example.org \ --email@example.com \ --firstname.lastname@example.org \ --subject='Re: [PATCH] revision: --include-diversions adds helpful merges' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
Code repositories for project(s) associated with this inbox: https://80x24.org/mirrors/git.git This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).