On Tue, May 28, 2019 at 7:37 AM Johannes Schindelin <Johannes.Schindelin@xxxxxx> wrote: > > Hi Matheus, > > On Mon, 20 May 2019, Matheus Tavares wrote: > > > > Give "rebase -i" some option so when you "reword" the patch is > > > included in the message. > > > > > > I keep going to the shell because I have no idea what change I'm > > > describing. > > > > I have the same problem, so I wanted to try solving this. The patch > > bellow creates a "rebase.verboseCommit" configuration that includes a > > diff when rewording or squashing. I'd appreciate knowing your thoughts > > on it. > > > > As Christian wisely pointed out to me, though, we can also achieve this > > behavior by setting "commit.verbose" to true. The only "downside" of it > > is that users cannot choose to see the diff only when rebasing. > > You could of course add an alias like > > [alias] > myrebase = -c commit.verbose=true rebase Hmm, I didn't know about `alias`. Thanks for the information. > which *should* work. > > However, I am actually slightly in favor of your patch because it *does* > make it more convenient to have this on during rebases only. Another option we were discussing is to document that rebase obeys all commit.* options, instead of adding the rebase.verboseCommit config. Yes, this way we won't be able to toggle diff for rebase only, but I'm not sure if that's something users would want to do... > Ciao, > Dscho
