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

Re: [PATCH v2 07/23] Documentation/git-worktree: add EXAMPLES section

From
Eric Sunshine <sunshine@sunshineco.com>
Date
Jul 4, 2015, 02:23 UTC
Message-ID
<CAPig+cRM=MA=1DtTrFA0PoHkmvZK8y7Y4gLLxSsHA+5sU47tow@mail.gmail.com>
In-Reply-To
<1435969052-540-8-git-send-email-sunshine@sunshineco.com>
On Fri, Jul 3, 2015 at 8:17 PM, Eric Sunshine <sunshine@sunshineco.com> wrote:
Show 5 quoted lines
> Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
> ---
> +EXAMPLES
> +--------
> +You are middle of a refactoring session and your boss comes in and demands
s/middle/in the &/
Show 24 quoted lines
> +that you fix something immediately. You might typically use
> +linkgit:git-stash[1] to store your changes away temporarily, however, your
> +worktree is in such a state of disarray (with new, removed, moved files,
> +and other bits and pieces strewn around) that you don't want to risk
> +disturbing any of it. Instead, you create a temporary linked worktree to
> +make the emergency fix, remove it when done, and then resume your earlier
> +refactoring session.
> +
> +------------
> +$ git branch emergency-fix master
> +$ git checkout --to ../temp emergency-fix
> +$ pushd ../temp
> +# ... hack hack hack ...
> +$ git commit -a -m 'emergency fix for boss'
> +$ popd
> +$ rm -rf ../temp
> +$ git worktree prune
> +------------
> +
>  BUGS
>  ----
>  Multiple checkout support for submodules is incomplete. It is NOT
> --
> 2.5.0.rc1.197.g417e668
Previous: Eric SunshineNext: Eric Sunshine
Message 11 of 38 in “replace "checkout --to" with "worktree add"”
  1. 00/23 replace "checkout --to" with "worktree add"Eric Sunshine, Jul 4, 2015
  2. 01/23 Documentation/git-checkout: fix incorrect worktree prune commandEric Sunshine, Jul 4, 2015
  3. 02/23 Documentation/git-worktree: associate options with commandsEric Sunshine, Jul 4, 2015
  4. 03/23 Documentation: move linked worktree description from checkout to worktreeEric Sunshine, Jul 4, 2015
  5. 04/23 Documentation/git-worktree: add BUGS sectionEric Sunshine, Jul 4, 2015
  6. Duy NguyenJul 4, 2015
  7. Eric SunshineJul 4, 2015
  8. 05/23 Documentation/git-worktree: split technical info from general descriptionEric Sunshine, Jul 4, 2015
  9. 06/23 Documentation/git-worktree: add high-level 'lock' overviewEric Sunshine, Jul 4, 2015
  10. 07/23 Documentation/git-worktree: add EXAMPLES sectionEric Sunshine, Jul 4, 2015
  11. Eric SunshineJul 4, 2015
  12. 08/23 checkout: fix bug with --to and relative HEADEric Sunshine, Jul 4, 2015
  13. Duy NguyenJul 4, 2015
  14. Eric SunshineJul 4, 2015
  15. 09/23 checkout: relocate --to's "no branch specified" checkEric Sunshine, Jul 4, 2015
  16. 10/23 checkout: prepare_linked_checkout: drop now-unused 'new' argumentEric Sunshine, Jul 4, 2015
  17. 11/23 checkout: make --to unconditionally verboseEric Sunshine, Jul 4, 2015
  18. 12/23 checkout: drop 'checkout_opts' dependency from prepare_linked_checkoutEric Sunshine, Jul 4, 2015
  19. 13/23 worktree: introduce "add" commandEric Sunshine, Jul 4, 2015
  20. Duy NguyenJul 4, 2015
  21. Eric SunshineJul 4, 2015
  22. Duy NguyenJul 6, 2015
  23. 14/23 worktree: add --force optionEric Sunshine, Jul 4, 2015
  24. 15/23 worktree: add --detach optionEric Sunshine, Jul 4, 2015
  25. 16/23 worktree: add -b/-B optionsEric Sunshine, Jul 4, 2015
  26. Duy NguyenJul 4, 2015
  27. Eric SunshineJul 4, 2015
  28. 17/23 tests: worktree: retrofit "checkout --to" tests for "worktree add"Eric Sunshine, Jul 4, 2015
  29. 18/23 checkout: retire --to optionEric Sunshine, Jul 4, 2015
  30. Duy NguyenJul 4, 2015
  31. Eric SunshineJul 4, 2015
  32. 19/23 checkout: require worktree unconditionallyEric Sunshine, Jul 4, 2015
  33. Eric SunshineJul 4, 2015
  34. 20/23 worktree: extract basename computation to new functionEric Sunshine, Jul 4, 2015
  35. 21/23 worktree: add: make -b/-B default to HEAD when <branch> is omittedEric Sunshine, Jul 4, 2015
  36. Junio C HamanoJul 6, 2015
  37. 22/23 worktree: add: auto-vivify new branch when <branch> is omittedEric Sunshine, Jul 4, 2015
  38. 23/23 checkout: retire --ignore-other-worktrees in favor of --forceEric Sunshine, Jul 4, 2015

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.