diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-07-11 23:47:29 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-07-11 23:47:29 -0700 |
| commit | 609eb9f7ff2af45d52ea90c0678a442d46aaa163 (patch) | |
| tree | ffc41d47800a65665625835215e9e82020954f1a /Documentation/git-checkout.txt | |
| parent | e13f38a33ed181b937c85fd9adf6bce755f69d00 (diff) | |
| parent | 5d1e34158a3023af48541bf1731d202849929a12 (diff) | |
| download | git-609eb9f7ff2af45d52ea90c0678a442d46aaa163.tar.gz | |
Merge branch 'maint'
* maint:
Documentation: Spelling fix in protocol-capabilities.txt
checkout: accord documentation to what git does
t0005: work around strange $? in ksh when program terminated by a signal
Diffstat (limited to 'Documentation/git-checkout.txt')
| -rw-r--r-- | Documentation/git-checkout.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt index 261dd90c38..1bacd2e104 100644 --- a/Documentation/git-checkout.txt +++ b/Documentation/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 |