From: Philip Oakley <philipoakley@iee.org>
To: GitList <git@vger.kernel.org>
Subject: [PATCH v1 2/3] doc: rebase: fixup! can take an object name
Date: Sun, 14 Aug 2016 22:46:29 +0100 [thread overview]
Message-ID: <20160814214630.1312-3-philipoakley@iee.org> (raw)
In-Reply-To: <20160814214630.1312-1-philipoakley@iee.org>
Since 68d5d03 (rebase: teach --autosquash to match on sha1 in addition
to message, 2010-11-04) the commit subject can refer directly to the
destination object hash as a single word.)...
Signed-off-by: Philip Oakley <philipoakley@iee.org>
---
v1
This is about the actual commit subject line, rather than the --fixup
options to the commit command.
This came out of https://public-inbox.org/git/FAE9116880074D6FA421942CCAEC368F@PhilipOakley/
where I was expecting to be able to say 'fixup! <sha1> my message', but
I can't (which would be another day's patch - fixup! <rev>! my message').
One question is whether 'standalone' is clear enough, or needs to say
'single word revision'? (which would mean it's not 'object name')
Further, with more digging, I think that any
rev specifier that has no spaces should work [1], despite the 68d5d's
title. Though maybe during the relevant phase of rebase -i some of the
rev specifiers may not work because of the series being rewound - dunno.
[1] https://github.com/git/git/blame/v2.9.2/git-rebase--interactive.sh#L790
---
Documentation/git-rebase.txt | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index 0387b40..66b789a 100644
--- a/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@ -421,7 +421,8 @@ without an explicit `--interactive`.
--no-autosquash::
When the commit log message begins with "squash! ..." (or
"fixup! ..."), and there is a commit whose title begins with
- the same ..., automatically modify the todo list of rebase -i
+ the same "..." message, or a commit object name (standalone),
+ automatically modify the todo list of rebase -i
so that the commit marked for squashing comes right after the
commit to be modified, and change the action of the moved
commit from `pick` to `squash` (or `fixup`). Ignores subsequent
--
2.9.0.windows.1
next prev parent reply other threads:[~2016-08-14 21:46 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-14 21:46 [PATCH v1 0/3] fixup fixup documenation Philip Oakley
2016-08-14 21:46 ` [PATCH v1 1/3] doc: commit: --fixup/--squash can take a commit revision Philip Oakley
2016-08-14 22:09 ` Junio C Hamano
2016-08-14 22:45 ` Philip Oakley
2016-08-14 22:55 ` Junio C Hamano
2016-08-14 23:29 ` Philip Oakley
2016-08-16 22:11 ` Philip Oakley
2016-08-14 21:46 ` Philip Oakley [this message]
2016-08-14 22:11 ` [PATCH v1 2/3] doc: rebase: fixup! can take an object name Junio C Hamano
2016-08-14 23:00 ` Philip Oakley
2016-08-14 23:02 ` Junio C Hamano
2016-08-14 23:30 ` Philip Oakley
2016-08-14 21:46 ` [PATCH v1 3/3] doc: rebase: clarify fixup! fixup! constraint Philip Oakley
2016-08-14 22:20 ` Junio C Hamano
2016-08-14 23:23 ` Philip Oakley
2016-08-15 15:42 ` 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=20160814214630.1312-3-philipoakley@iee.org \
--to=philipoakley@iee.org \
--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).