Re: [RFC/PATCH] add diffstat information to rebase

From: Duy Nguyen <pclouds@gmail.com>
Date: Dec 25, 2016, 00:52 UTC
Message-ID: <CACsJy8B8uaKGqc0MV0v35RT0i0P=Fo8Md0J2BtA25cq5+d4t5g@mail.gmail.com>
In-Reply-To: <20161222221327.7354-1-sbeller@google.com>

On Fri, Dec 23, 2016 at 5:13 AM, Stefan Beller <sbeller@google.com> wrote:

Show 17 quoted lines

> *Ideally* I would rather have a different formatting, e.g. maybe:
>
>     $ git checkout remotes/origin/js/sequencer-wo-die
>     $ git rebase -i --new-magic v2.10.0-rc2^
>
> which produces:
>
>     pick d5cb9cbd64 Git 2.10-rc2                                    | Documentation/RelNo.., GIT-VERSION-GEN -..(+5, -1)
>     ...
>     pick dbfad033d4 sequencer: do not die() in do_pick_commit()     | sequencer.c - do_pick_commit              (+7, -6)
>     pick 4ef3d8f033 sequencer: lib'ify write_message()              | sequencer.c - write_message, do_pick_com..(+11, -9)
>     ...
>     ...
>     pick 88d5a271b0 sequencer: lib'ify save_opts()                  | sequencer.c - save_opts + sequencer_pick..(+20, -20)
>     pick 0e408fc347 sequencer: lib'ify fast_forward_to()            | sequencer.c - fast_forward_to             (+1, -1)
>     pick 55f5704da6 sequencer: lib'ify checkout_fast_forward()      | sequencer.c - checkout_fast_forward       (+6, -3)
>     pick 49fb937e9a sequencer: ensure to release the lock when w... | sequencer.c - read_and_refresh_cache      (+6, -3)

Instead of guessing the changes based on diffstat, you could add the actual commit message (besides the subject line) after that '|' for fixup! and squash! commits (and it's probably should be "#" instead of "!"). Then you could just describe what you have changed in the commit messages. If you don't use autosquash, you'll need some way to mark "to-be-merged" commits though, so that you don't put all commit messages here.

-- 
Duy