From: Paul Ebermann <Paul.Ebermann@esperanto.de>
To: John Lumby <johnlumby@hotmail.com>
Cc: git@vger.kernel.org
Subject: Re: git -- how to revert build to as-originally-cloned?
Date: Fri, 20 May 2011 21:34:43 +0200 [thread overview]
Message-ID: <4DD6C253.2040309@esperanto.de> (raw)
In-Reply-To: <4DD6BE8D.4080708@hotmail.com>
John Lumby schrieb:
> On 05/20/11 12:25, George Spelvin wrote:
>> Er, no. One "git merge" command produces (at most) one commit.
>> It may be that the head of the branch you merged in was already
>> a merge commit, but tha
>>
>> You may find "gitk" useful for for visualizing all of this.
>
> I have tried gitk. Can you or someone tell me what the colours of the
> nodes in the top left signifies?
> Specifically, a commit of mine (done since all the merging I've been
> asking about) shows as yellow, whereas all the ones prior to that
> show as blue. (I have not altered or changed the colour scheme so
> it's whatever the default is)
For the nodes:
Yellow is the current HEAD. Red is your worktree, if differing
from the index, green is the index, if differing from HEAD.
Everything else (in blue) are other commits in the repository.
The color of the lines is not significant, I think (or at least
I didn't recognize any regularity here).
(This is for my version of gitk, whichever this might be. I didn't
find a way to find out. It says "(c) 2005-2010" in the "about" dialog
and "(c) 2005-2009" in the start of the source code.
Paŭlo
next prev parent reply other threads:[~2011-05-20 19:40 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-20 16:25 git -- how to revert build to as-originally-cloned? George Spelvin
2011-05-20 19:18 ` John Lumby
2011-05-20 19:34 ` Paul Ebermann [this message]
2011-05-20 20:22 ` George Spelvin
2011-05-20 20:26 ` George Spelvin
-- strict thread matches above, loose matches on Subject: below --
2011-05-18 22:53 John Lumby
2011-05-18 23:26 ` Tim Mazid
2011-05-19 15:27 ` John Lumby
2011-05-20 2:16 ` Tim Mazid
2011-05-20 14:15 ` John Lumby
2011-05-20 14:42 ` Philippe Vaucher
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=4DD6C253.2040309@esperanto.de \
--to=paul.ebermann@esperanto.de \
--cc=git@vger.kernel.org \
--cc=johnlumby@hotmail.com \
/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.