Skip to content

custom format for interactive rebase todo

William Clifford git 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest2 patches 4 repliesIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/2Add sequence.format to interactive rebasegit-rebase--interactive.sh+13 -10 replies
2/2Add documentation for sequence.formatDocumentation/config.txt+9 -00 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v1 yet.

Read the v1 thread

Cover letter [PATCH/RFC 0/2] custom format for interactive rebase todo

I'm sorry if this shows up twice. I messed up the first time.

I was recently in a situation of rebasing a topic branch with many commits by several colleagues and I thought it would be useful if I could see the author of the commit in the commit table in the rebase todo file. I wanted try to squash commits by the same author where appropriate. With the help of Matt Boeh, we figured out how to patch in custom formatting of this line, and I have been trying it out for the last couple of weeks and it seems to work pretty well.

A couple of examples:

- git config sequence.format "%<(12,trunc)%ae %s"
- git config sequence.format "%s <%aN %aE>"
- git config sequence.format "%s%n%%n%b"

The first one tries to conserve linespace, which is a good idea for these formats. The second one could be really long but otherwise harmless. I'm unsure what would happen if I tried to rebase with the third style unedited or uncommented. I'm wary of casually testing it. It does not seem like a good idea, and should perhaps be discouraged.

Please let me know what you think.

William Clifford (2):
Add sequence.format to interactive rebase
Add documentation of sequence.format to interactive rebase

 Documentation/config.txt   |  9 +++++++++
 git-rebase--interactive.sh | 14 +++++++++++++-
 2 files changed, 22 insertions(+), 1 deletion(-)
Signature · 4 lines
William Clifford

Message-ID: <[email protected]>
X-Draft-From: ("INBOX")