git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Please remerge git-gui.git into git.git

From
Shawn O. Pearce <spearce@spearce.org>
Date
Jun 11, 2007, 23:10 UTC
Message-ID
<20070611231013.GM6073@spearce.org>

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: Junio C Hamano
Message 1 of 4 in “Please remerge git-gui.git into git.git”
  1. Shawn O. PearceJun 11, 2007
  2. Junio C HamanoJun 11, 2007
  3. Shawn O. PearceJun 12, 2007
  4. Junio C HamanoJun 12, 2007

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.