diff options
author | Junio C Hamano <gitster@pobox.com> | 2019-02-05 15:33:56 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-02-05 15:33:56 -0800 |
commit | 2567b326fac6961a6fc6075ad2f22a744252f2f3 (patch) | |
tree | 2e4c640f64f1f8f00b992e414a2fd316aea798d4 /git-checkout.txt | |
parent | cf7310088e7328f8aa7ea2c5de767ef9499b5d78 (diff) | |
download | git-htmldocs-2567b326fac6961a6fc6075ad2f22a744252f2f3.tar.gz |
Autogenerated HTML docs for v2.20.1-519-g8fedd
Diffstat (limited to 'git-checkout.txt')
-rw-r--r-- | git-checkout.txt | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/git-checkout.txt b/git-checkout.txt index 6acc3d98e..9a396498d 100644 --- a/git-checkout.txt +++ b/git-checkout.txt @@ -424,14 +424,14 @@ $ git tag foo <3> ------------ <1> creates a new branch 'foo', which refers to commit 'f', and then -updates HEAD to refer to branch 'foo'. In other words, we'll no longer -be in detached HEAD state after this command. + updates HEAD to refer to branch 'foo'. In other words, we'll no longer + be in detached HEAD state after this command. <2> similarly creates a new branch 'foo', which refers to commit 'f', -but leaves HEAD detached. + but leaves HEAD detached. <3> creates a new tag 'foo', which refers to commit 'f', -leaving HEAD detached. + leaving HEAD detached. If we have moved away from commit 'f', then we must first recover its object name (typically by using git reflog), and then we can create a reference to @@ -459,8 +459,8 @@ EXAMPLES -------- . The following sequence checks out the `master` branch, reverts -the `Makefile` to two revisions back, deletes hello.c by -mistake, and gets it back from the index. + the `Makefile` to two revisions back, deletes hello.c by + mistake, and gets it back from the index. + ------------ $ git checkout master <1> @@ -494,7 +494,7 @@ $ git checkout -- hello.c ------------ . After working in the wrong branch, switching to the correct -branch would be done using: + branch would be done using: + ------------ $ git checkout mytopic @@ -522,7 +522,7 @@ registered in your index file, so `git diff` would show you what changes you made since the tip of the new branch. . When a merge conflict happens during switching branches with -the `-m` option, you would see something like this: + the `-m` option, you would see something like this: + ------------ $ git checkout -m mytopic |