git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Eric Sunshine <sunshine@sunshineco.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Git List <git@vger.kernel.org>
Subject: Re: What's cooking in git.git (Jul 2015, #03; Fri, 10)
Date: Fri, 10 Jul 2015 18:58:54 -0400	[thread overview]
Message-ID: <CAPig+cRqaHszW_zA6FQ4CCurYK-Gcd83+W-jHKWwtJTVbB0RAg@mail.gmail.com> (raw)
In-Reply-To: <xmqqh9pbk4y5.fsf@gitster.dls.corp.google.com>

On Fri, Jul 10, 2015 at 6:45 PM, Junio C Hamano <gitster@pobox.com> wrote:
> * es/worktree-add (2015-07-07) 23 commits
>   (merged to 'next' on 2015-07-10 at 304e329)
>  + checkout: retire --ignore-other-worktrees in favor of --force
>  + worktree: add: auto-vivify new branch when <branch> is omitted
>  + worktree: add: make -b/-B default to HEAD when <branch> is omitted
>  + worktree: extract basename computation to new function
>  + checkout: require worktree unconditionally
>  + checkout: retire --to option
>  + tests: worktree: retrofit "checkout --to" tests for "worktree add"
>  + worktree: add -b/-B options
>  + worktree: add --detach option
>  + worktree: add --force option
>  + worktree: introduce "add" command
>  + checkout: drop 'checkout_opts' dependency from prepare_linked_checkout
>  + checkout: make --to unconditionally verbose
>  + checkout: prepare_linked_checkout: drop now-unused 'new' argument
>  + checkout: relocate --to's "no branch specified" check
>  + checkout: fix bug with --to and relative HEAD
>  + Documentation/git-worktree: add EXAMPLES section
>  + Documentation/git-worktree: add high-level 'lock' overview
>  + Documentation/git-worktree: split technical info from general description
>  + Documentation/git-worktree: add BUGS section
>  + Documentation: move linked worktree description from checkout to worktree
>  + Documentation/git-worktree: associate options with commands
>  + Documentation/git-checkout: fix incorrect worktree prune command
>  (this branch uses nd/multiple-work-trees.)
>
>  Update to the "linked checkout" in 2.5.0-rc1.
>
>  Instead of "checkout --to" that does not do what "checkout"
>  normally does, move the functionality to "git worktree add".
>
>  Will merge to 'master'.

Did you want to drop the final patch[*1*] which retires
--ignore-other-worktrees in favor of --force before letting this
graduate to 'master'?

By the way, v1 of the follow-on series which replaces "git checkout"
with "git reset --hard" to populate the new worktree is ready. I
expect to send it out shortly.

[*1*]: http://thread.gmane.org/gmane.comp.version-control.git/273415/focus=273585

  reply	other threads:[~2015-07-10 22:59 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-07-10 22:45 What's cooking in git.git (Jul 2015, #03; Fri, 10) Junio C Hamano
2015-07-10 22:58 ` Eric Sunshine [this message]
2015-07-12 16:38   ` Junio C Hamano
2015-07-11  8:45 ` Johannes Schindelin

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

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=CAPig+cRqaHszW_zA6FQ4CCurYK-Gcd83+W-jHKWwtJTVbB0RAg@mail.gmail.com \
    --to=sunshine@sunshineco.com \
    --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.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).