diff --git a/docs/keybindings/Keybindings_ja.md b/docs/keybindings/Keybindings_ja.md
index a07f7bb33..761d745d7 100644
--- a/docs/keybindings/Keybindings_ja.md
+++ b/docs/keybindings/Keybindings_ja.md
@@ -85,6 +85,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
   <kbd>ctrl+k</kbd>: コミットを1つ上に移動
   <kbd>v</kbd>: コミットを貼り付け (cherry-pick)
   <kbd>A</kbd>: ステージされた変更でamendコミット
+  <kbd>a</kbd>: reset commit author
   <kbd>t</kbd>: コミットをrevert
   <kbd>T</kbd>: タグを作成
   <kbd>ctrl+l</kbd>: ログメニューを開く
diff --git a/pkg/cheatsheet/check.go b/pkg/cheatsheet/check.go
index 6ee4de21f..a0c40e775 100644
--- a/pkg/cheatsheet/check.go
+++ b/pkg/cheatsheet/check.go
@@ -47,7 +47,7 @@ func Check() {
 		if err != nil {
 			log.Fatalf("Error occurred while checking if cheatsheets are up to date: %v", err)
 		}
-		fmt.Printf("\nCheatsheets are out of date. Please run `%s` at the project root and commit the changes\n", CommandToRun())
+		fmt.Printf("\nCheatsheets are out of date. Please run `%s` at the project root and commit the changes. If you run the script and no keybindings files are updated as a result, try rebasing onto master and trying again.\n", CommandToRun())
 		os.Exit(1)
 	}