Charvi Mendiratta <charvi077@xxxxxxxxx> writes: > +static int prepare_amend_commit(struct commit *commit, struct strbuf *sb, > + struct pretty_print_context *ctx) { Why does this need to be overly indented? Are you using some funny tab width settings? In this project, a tab stop is 8-spaces wide. > + /* > + * Only `-m` commit message option is checked here, as > + * it supports `--fixup` to append the commit message. As it is OK to use "-m" with the plain vanilla "--fixup", an earlier check did not reject the combination, but now we look at what kind of fixup it is, and error out if it is "--fixup=amend:". OK. > + * The other commit message options `-c`/`-C`/`-F` are > + * incompatible with all the forms of `--fixup` and > + * have already errored out while parsing the `git commit` > + * options. > + */