From: "Shawn O. Pearce" <spearce@spearce.org>
To: Junio C Hamano <gitster@pobox.com>, git@vger.kernel.org
Subject: Please remerge git-gui.git into git.git
Date: Mon, 11 Jun 2007 19:10:13 -0400 [thread overview]
Message-ID: <20070611231013.GM6073@spearce.org> (raw)
Currently the tree between git-gui.git and git.git:git-gui does
not match, due to a6080a0a44d5ead84db3dabbbc80e82df838533d, aka the
"War on whitespace".
I really want the git-gui tree in git.git to always match the tree
of the 2nd parent of the merge commit, as that is how git-gui's
own GIT-VERSION-GEN script finds the git-gui commit DAG and gets
git-describe to produce a git-gui specific version number, rather
than the git.git version number.
Right now that script is barfing and coming up with "0.8.GITGUI",
which isn't a valid version number, and means nothing to everyone.
So new `maint` and `master` branches are in git-gui.git.
Thanks! ;-)
--
Shawn.
next reply other threads:[~2007-06-11 23:10 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-06-11 23:10 Shawn O. Pearce [this message]
2007-06-11 23:59 ` Please remerge git-gui.git into git.git Junio C Hamano
2007-06-12 2:27 ` Shawn O. Pearce
2007-06-12 5:25 ` Junio C Hamano
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=20070611231013.GM6073@spearce.org \
--to=spearce@spearce.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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.