Junio C Hamano <gitster@xxxxxxxxx> 于2021年7月28日周三 上午5:00写道: > Otherwise we can allocate a new bit in the structure, have relevant > callers set it, and teach cherry-pick an unadvertised command line > option that sets the bit, and use that option only from > git-rebase--preserve-merges when it makes a call to cherry-pick. > When "rebase -p" is either retired or rewritten in C, we can retire > the option from cherry-pick. > Just use a PARSE_OPT_HIDDEN cannot prevent the user from using the option... Is there a better way? -- ZheNing Hu