From: William Clifford <mr.william.clifford@gmail.com>
To: git@vger.kernel.org
Subject: [PATCH/RFC 0/2] custom format for interactive rebase todo
Date: Mon, 8 Sep 2014 21:47:56 -0700 [thread overview]
Message-ID: <864mwhi9qu.fsf@gmail.com> (raw)
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(-)
--
William Clifford
Message-ID: <867g1dia81.fsf@gmail.com>
X-Draft-From: ("INBOX")
next reply other threads:[~2014-09-09 6:34 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-09 4:47 William Clifford [this message]
2014-09-09 16:58 ` [PATCH/RFC 0/2] custom format for interactive rebase todo Junio C Hamano
2014-09-09 17:07 ` Junio C Hamano
2014-09-10 14:48 ` William Clifford
2014-09-10 17:11 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=864mwhi9qu.fsf@gmail.com \
--to=mr.william.clifford@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).