Thread (37 messages) flat view 37 messages, 2 authors, 2016-06-15

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

From: Eric Sunshine <hidden>
Date: 2016-06-15 23:05:39

On Fri, Jul 3, 2015 at 8:17 PM, Eric Sunshine [off-list ref] wrote:
Signed-off-by: Eric Sunshine <redacted>
---
+EXAMPLES
+--------
+You are middle of a refactoring session and your boss comes in and demands
s/middle/in the &/
+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
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help