diff options
| author | Junio C Hamano <junio@kernel.org> | 2010-07-12 14:14:18 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@kernel.org> | 2010-07-12 14:14:18 +0000 |
| commit | f2d3a37e34b547812b378f4079788d732c3f5e1f (patch) | |
| tree | 81e83775157e66dc8f65449e5e071b476e44e073 /git-checkout.txt | |
| parent | d00c92a56a10f6677c65bae224997d9a2d5af2eb (diff) | |
| download | git-htmldocs-f2d3a37e34b547812b378f4079788d732c3f5e1f.tar.gz | |
Autogenerated HTML docs for v1.7.2-rc2-8-g609e
Diffstat (limited to 'git-checkout.txt')
| -rw-r--r-- | git-checkout.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-checkout.txt b/git-checkout.txt index 261dd90c3..1bacd2e10 100644 --- a/git-checkout.txt +++ b/git-checkout.txt @@ -263,7 +263,7 @@ the above checkout would fail like this: + ------------ $ git checkout mytopic -fatal: Entry 'frotz' not uptodate. Cannot merge. +error: You have local changes to 'frotz'; not switching branches. ------------ + You can give the `-m` flag to the command, which would try a |