Thread (20 messages) flat view 20 messages, 5 authors, 2016-06-15

Re: [PATCH 1/2] commit: add message options for rebase --autosquash

From: Stephen Boyd <hidden>
Date: 2016-06-15 22:49:33

On Fri, Sep 17, 2010 at 9:14 AM, Bryan Drewery [off-list ref] wrote:
Stephen Boyd wrote:
quoted
On 09/16/2010 06:39 PM, Pat Notz wrote:
quoted
These options make it convenient to construct commit messages for use
with 'rebase --autosquash'.  The resulting commit message will be
"fixup! ..." or "squash! ..." where "..." is the subject line of the
specified commit message.

Example usage:
 $ git commit --fixup HEAD~2
 $ git commit --squash HEAD~5

Signed-off-by: Pat Notz <redacted>
---
So far I've been using an alias for these, but I suppose making them
real features of git could be worthwhile. What are the benefits with
this approach vs. an alias?
I keep wanting to do these at commit time.

What are the alternative aliases?
`git fixup' is aliased to `!f() { git commit -m "$(git show -s
--pretty='format:fixup! %s%n%nFixup for %h%n' "$1")" $2; }; f'
`git squash' is aliased to `!f() { git commit -m "$(git show -s
--pretty='format:squash! %s%n%n' "$1")" -e $2; }; f'
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help