Re: [PATCH 2/2] rebase: add --show-patch
- From
Duy Nguyen <pclouds@gmail.com>
- Date
- Jan 26, 2018, 11:22 UTC
- Message-ID
- <CACsJy8BsJjuxD8hhZ9P2KgTxraRvCJgYt83onBaD_gXA0ZP9DA@mail.gmail.com>
- In-Reply-To
- <4d7eb4c8-8d48-7c8d-259a-ba6b2f64def0@talktalk.net>
On Fri, Jan 26, 2018 at 6:12 PM, Phillip Wood <phillip.wood@talktalk.net> wrote:
Show 16 quoted lines
>> diff --git a/git-rebase--merge.sh b/git-rebase--merge.sh
>> index 06a4723d4d..5c513a9736 100644
>> --- a/git-rebase--merge.sh
>> +++ b/git-rebase--merge.sh
>> @@ -137,6 +137,10 @@ skip)
>> finish_rb_merge
>> return
>> ;;
>> +show-patch)
>> + cmt="$(cat "$state_dir/current")"
>> + exec git format-patch --subject-prefix= --stdout "${cmt}^!"
>> + ;;
>> esac
>
> Here and in the git-rebase--interactive you have access to the SHA of
> the failed pick so you could run git log --patch and git colored outputYes. My first revision I actually did "git diff" here. The only problem is inconsistency because we can't color "git am --show-patch" the same way, the patch source is in text format, not in the repo. But if people are ok with that I sure would switch to "git show".
> and it would use the pager in the same way as 'git am --show-patch' does
format-patch does set up pager. If it does not I would be very annoyed. I added this for convenience after all.
-- Duy