On Fri, Dec 22, 2017 at 11:00 AM, Ævar Arnfjörð Bjarmason <avarab@xxxxxxxxx> wrote: > Here's a hopefully ready to apply v2 incorporating feedback from Eric > (thanks!). A tbdiff with v1 follows below. > > Ævar Arnfjörð Bjarmason (2): > commit doc: document that -c, -C, -F and --fixup with -m error > commit: add support for --fixup <commit> -m"<extra message>" Patch 2/2 doesn't seem to have made it to the list... > 2: bd78a211ed ! 2: 780de6e042 commit: add support for --fixup <commit> -m"<extra message>" > @@ -22,6 +22,21 @@ > In such a case you might want to leave a small message, > e.g. "forgot this part, which broke XYZ". > > + With this, --fixup <commit> -m"More" -m"Details" will result in a > + commit message like: > + > + !fixup <subject of <commit>> > + > + More > + > + Details > + > + The reason the test being added here seems to squash "More" at the end > + of the subject line of the commit being fixed up is because the test > + code is using "%s%b" so the body immediately follows the subject, it's > + not a bug in this code, and other tests t7500-commit.sh do the same > + thing. Did you also intend to mention something about --edit still working with -m? (Or do we assume that people will understand automatically that it does?)
