From: Junio C Hamano <gitster@pobox.com>
To: Josh Brunton <josh.brunton@proton.me>
Cc: "git@vger.kernel.org" <git@vger.kernel.org>
Subject: Re: [RFC] Proposal to add a delimiter between unrelated history in git-log --graph --oneline
Date: Wed, 04 Dec 2024 08:32:18 +0900 [thread overview]
Message-ID: <xmqqfrn49wcd.fsf@gitster.g> (raw)
In-Reply-To: <FNUesYPDfyA16MXr4g9q7vW9OQ6bfbUK1umvVjONQNgEsQJZV5sIvRX9MlHfRILe4-hhINNy59uNjywL4abyJT43JVYjXU0ofUGWKQo0lFA=@proton.me> (Josh Brunton's message of "Tue, 03 Dec 2024 17:29:46 +0000")
Josh Brunton <josh.brunton@proton.me> writes:
> There is a clear disconnect between commits dec7d4c 7260dff, showing that
> they represent 2 unrelated histories. However, passing --oneline as well produces
> the following output:
> * e5698bf (main2) History 2 - Add SECURITY.md
> * 7260dff History 2 - Add .gitattributes
> * dec7d4c (HEAD -> main) History 1 - Add README.md
> * 3f25318 History 1 - Add gitignore
> ...
> I therefore suggest that a separator line (perhaps a blank line) might be
> added between unrelated histories which would otherwise seem related in --oneline
> --graph.
Please do not do this.
If you find this a good way to separate two lines of histories:
> * 15177d2 (HEAD -> main) Merge branch 'main2'
> |\
> | * e5698bf (main2) History 2 - Add SECURITY.md
> | * 7260dff History 2 - Add .gitattributes
> * dec7d4c History 1 - Add README.md
> * 3f25318 History 1 - Add gitignore
then something like
| * e5698bf (main2) History 2 - Add SECURITY.md
| * 7260dff History 2 - Add .gitattributes
* dec7d4c History 1 - Add README.md
* 3f25318 History 1 - Add gitignore
would be much better than
* e5698bf (main2) History 2 - Add SECURITY.md
* 7260dff History 2 - Add .gitattributes
* dec7d4c History 1 - Add README.md
* 3f25318 History 1 - Add gitignore
that wastes valuable vertical screen estate.
I do not deeply care if the '|' part gets blanked out until two
histories are merged, iow,
* e5698bf (main2) History 2 - Add SECURITY.md
* 7260dff History 2 - Add .gitattributes
* dec7d4c History 1 - Add README.md
* 3f25318 History 1 - Add gitignore
is fine as well.
prev parent reply other threads:[~2024-12-03 23:32 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-12-03 17:29 [RFC] Proposal to add a delimiter between unrelated history in git-log --graph --oneline Josh Brunton
2024-12-03 23:32 ` Junio C Hamano [this message]
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqfrn49wcd.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=josh.brunton@proton.me \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.