From 142183d09634aa00a47107c7ffc5e39fa6cbf1b0 Mon Sep 17 00:00:00 2001 From: Nicolas Sebrecht Date: Fri, 9 Jul 2010 22:27:48 +0200 Subject: checkout: accord documentation to what git does Signed-off-by: Nicolas Sebrecht Signed-off-by: Junio C Hamano --- Documentation/git-checkout.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Documentation') diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt index 7146288ad6..7b83162223 100644 --- a/Documentation/git-checkout.txt +++ b/Documentation/git-checkout.txt @@ -238,7 +238,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 -- cgit v1.3 From 5d1e34158a3023af48541bf1731d202849929a12 Mon Sep 17 00:00:00 2001 From: Fredrik Skolmli Date: Sat, 10 Jul 2010 02:00:01 +0200 Subject: Documentation: Spelling fix in protocol-capabilities.txt Signed-off-by: Fredrik Skolmli Signed-off-by: Junio C Hamano --- Documentation/technical/protocol-capabilities.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Documentation') diff --git a/Documentation/technical/protocol-capabilities.txt b/Documentation/technical/protocol-capabilities.txt index fd1a593149..b15517fa06 100644 --- a/Documentation/technical/protocol-capabilities.txt +++ b/Documentation/technical/protocol-capabilities.txt @@ -119,7 +119,7 @@ both. ofs-delta --------- -Server can send, and client understand PACKv2 with delta refering to +Server can send, and client understand PACKv2 with delta referring to its base by position in pack rather than by an obj-id. That is, they can send/read OBJ_OFS_DELTA (aka type 6) in a packfile. -- cgit v1.3