commit 79878eb8ee8fb9380505ae4a7a252cf38dc273d2 from: James Cook via: Thomas Adam date: Wed Jul 05 15:54:47 2023 UTC histedit, rebase: document -c, -C are compatible commit - dcd455ee64953215a90ed4427762b5566d7e0047 commit + 79878eb8ee8fb9380505ae4a7a252cf38dc273d2 blob - 231499e9b3d7e9b5a4b16e309d923b73bc5fd97d blob + 96f5c68c5ec9bbaca2f9031c659305f430e14ec3 --- got/got.1 +++ got/got.1 @@ -2397,7 +2397,8 @@ This option should generally be avoided, and can only option. .It Fl c Continue an interrupted rebase operation. -If this option is used, no other command-line arguments are allowed. +If this option is used, no other command-line arguments are allowed except +.Fl C . .It Fl l Show a list of past rebase operations, represented by references in the .Dq refs/got/backup/rebase @@ -2661,7 +2662,8 @@ This option should generally be avoided, and can only option. .It Fl c Continue an interrupted histedit operation. -If this option is used, no other command-line arguments are allowed. +If this option is used, no other command-line arguments are allowed except +.Fl C . .It Fl d Drop all commits. This option is a quick equivalent to a histedit script which drops all