Follow

Now something for you professionals: I want to reword a few commits in a branch with an interactive rebase. But in the interactive rebase, I want to see the diff in my editor. How to?

· · Web · 3 · 1 · 1

@musicmatze, I guess you can C-z then pipe git show to ed IDK, the

in my editor

part seems redundant don’t you think so as well, @bugaevc?

@musicmatze @bugaevc I'm very happy with emacs, especially for those little extra features...

@musicmatze I think you could do that with edit option for a commit on which you want to stop. It allows you to edit a commit (even it's contents) and I guess you could then see the diff you wan't. After you're done just amend the commit and continue the rebase. When you're amending the commit, you can change the commit message.

@musicmatze if I am understanding the request correctly, could you use: `git -c commit.verbose=true rebase ...`¹ to cause the diff to show up in your commit message editor? Would that suffice for your purposes?

¹: git-scm.com/docs/git-config#Do

Sign in to participate in the conversation
Mastodon for Tech Folks

This Mastodon instance is for people interested in technology. Discussions aren't limited to technology, because tech folks shouldn't be limited to technology either!