Merge branch 'ew/repack-with-bitmaps-by-default'

diff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt
index 9ce5b8aaee345f07d3bc9eb3eb0c7513c6989900..b9b97e63aec5e73e7c5607c19661639a256dc1ed 100644 (file)
--- a/Documentation/git-format-patch.txt
+++ b/Documentation/git-format-patch.txt
@@ -426,8 +426,8 @@ One way to test if your MUA is set up correctly is:
 * Apply it:
 
     $ git fetch <project> master:test-apply
-    $ git checkout test-apply
-    $ git reset --hard
+    $ git switch test-apply
+    $ git restore --source=HEAD --staged --worktree :/
     $ git am a.patch
 
 If it does not apply correctly, there can be various reasons.