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

What's in git.git

From
Junio C Hamano <junkio@cox.net>
Date
Feb 9, 2006, 06:47 UTC
Message-ID
<7vslqtf2p1.fsf@assigned-by-dhcp.cox.net>

I haven't heard major breakage around the new features scheduled for 1.2.0 so far, except for the two-tree "diff-tree --cc" Linus has already fixed, so the previous "What's new" is pretty much unchanged.

One *major* change I am thinking about doing is to change my workflow a bit. So far, the proposed updates branch "pu" was almost impossible to follow unless you are really a devoted git developer, because it is always rebased to the latest master and then topic branches are merged onto it. While that keeps the number of unnecessary merge nodes between master and pu to the minimum, it actively discouraged for the branch to be followed by developers.

I would like to rectify that.

So I have created another branch, "next". This is managed quite differently from "pu". I'd promise these things:

 * It is to contain planned updates and merge from topic
   branches, just like "pu" currently does.  However, the topics
   merged there will not contain majorly whacky / unproven ones
   like bind commits and shallow clones, until the basic part
   proves sound during the list discussion.
 * I will not rewind or rebase the "next" branch.  Also I will
   not rebase the topic branches that are merged into it.
 * It would occasionally merge from "master" if only to prevent
   conflicts.
 * If there are patches sent to improve a topic branch in it,
   they will be applied to the topic branch, and then the topic
   branch is merged into "next", without any funny rewinding or
   rebasing of "next".  This will make the "next" branch
   cluttered with repeated merges from the same topic branch,
   but that is OK.  "next" will not be merged into "master",
   ever.
 * Once a topic is fully cooked, the topic branch will be merged
   into "master".

What this means is that "next" should be as easy to follow as "master", but still is slightly ahead of "master" with not so wildly experimental features.

Although there theoretically is no reason not to follow the above principles I set for "next" to manage "pu", it will stay wild for now until I get more comfortable with this workflow.

Now, what's in "next"? Currently I have two topic branches merged to it.

    * jc/nostat:
      ls-files: debugging aid for CE_VALID changes.
      "Assume unchanged" git: do not set CE_VALID with --refresh
      "Assume unchanged" git
    * jc/empty-commit:
      t6000: fix a careless test library add-on.
      Do not allow empty name or email.
Next: sean
Message 1 of 16 in “What's in git.git”
  1. Junio C HamanoFeb 9, 2006
  2. seanFeb 9, 2006
  3. Andreas EricssonFeb 9, 2006
  4. seanFeb 9, 2006
  5. Junio C HamanoFeb 9, 2006
  6. Andreas EricssonFeb 9, 2006
  7. Junio C HamanoFeb 9, 2006
  8. Andreas EricssonFeb 9, 2006
  9. Junio C HamanoFeb 10, 2006
  10. Johannes SchindelinFeb 9, 2006
  11. Junio C HamanoFeb 9, 2006
  12. Johannes SchindelinFeb 9, 2006
  13. Tony LuckFeb 9, 2006
  14. Ryan AndersonFeb 9, 2006
  15. Junio C HamanoFeb 9, 2006
  16. Junio C HamanoFeb 10, 2006

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.