From: Duy Nguyen <pclouds@gmail.com>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: [PATCH 0/2] Add "git rebase --show-patch"
Date: Tue, 30 Jan 2018 16:10:35 +0700 [thread overview]
Message-ID: <CACsJy8AH+xg3AB3qaqnFud4B8HHeyaO=8DqHL+p4HTTeSx6uYg@mail.gmail.com> (raw)
In-Reply-To: <nycvar.QRO.7.76.6.1801291609060.35@ZVAVAG-6OXH6DA.rhebcr.pbec.zvpebfbsg.pbz>
On Mon, Jan 29, 2018 at 10:09 PM, Johannes Schindelin
<Johannes.Schindelin@gmx.de> wrote:
> Hi Duy,
>
> On Fri, 26 Jan 2018, Nguyễn Thái Ngọc Duy wrote:
>
>> When a conflict happens during a rebase, you often need to look at the
>> original patch to see what the changes are. This requires opening your
>> favourite pager with some random path inside $GIT_DIR.
>>
>> This series makes that experience a bit better, by providing a command
>> to read the patch. This is along the line of --edit-todo and --quit
>> where you can just tell git what to do and not bother with details.
>>
>> My main focus is "git rebase", but because rebase uses "git am" behind
>> the scene, "git am" gains --show-patch option too.
>
> Makes sense. I am not a 100% certain that 2/2 catches all rebase -i corner
> cases, but I think the patches are good enough even for `next` already.
Not so fast :) With Tim's suggestion about using a pseudo ref and
AEvar complaint about potential confusion, I might actually go with
pseudo ref for rebase (and leave "git am" in the cold for now).
--
Duy
next prev parent reply other threads:[~2018-01-30 9:11 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-26 9:55 [PATCH 0/2] Add "git rebase --show-patch" Nguyễn Thái Ngọc Duy
2018-01-26 9:55 ` [PATCH 1/2] am: add --show-patch Nguyễn Thái Ngọc Duy
2018-01-26 9:55 ` [PATCH 2/2] rebase: " Nguyễn Thái Ngọc Duy
2018-01-26 11:12 ` Phillip Wood
2018-01-26 11:22 ` Duy Nguyen
2018-01-30 11:15 ` Phillip Wood
2018-01-26 19:11 ` Eric Sunshine
2018-01-27 1:42 ` Duy Nguyen
2018-01-26 18:47 ` [PATCH 0/2] Add "git rebase --show-patch" Tim Landscheidt
2018-01-27 1:45 ` Duy Nguyen
2018-01-27 11:26 ` Ævar Arnfjörð Bjarmason
2018-01-29 15:09 ` Johannes Schindelin
2018-01-30 9:10 ` Duy Nguyen [this message]
2018-01-30 12:32 ` Johannes Schindelin
2018-01-30 20:19 ` Junio C Hamano
2018-02-01 2:06 ` Tim Landscheidt
2018-01-31 9:30 ` [PATCH v2 0/3] " Nguyễn Thái Ngọc Duy
2018-01-31 9:30 ` [PATCH v2 1/3] am: add --show-current-patch Nguyễn Thái Ngọc Duy
2018-01-31 9:40 ` Eric Sunshine
2018-01-31 22:59 ` Junio C Hamano
2018-02-02 9:25 ` Duy Nguyen
2018-02-02 9:46 ` Eric Sunshine
2018-02-02 9:53 ` Duy Nguyen
2018-02-02 18:56 ` Junio C Hamano
2018-01-31 9:30 ` [PATCH] gitignore.txt: elaborate shell glob syntax Nguyễn Thái Ngọc Duy
2018-01-31 23:22 ` Junio C Hamano
2018-02-01 9:59 ` Duy Nguyen
2018-01-31 9:30 ` [PATCH v2 2/3] rebase: add --show-current-patch Nguyễn Thái Ngọc Duy
2018-01-31 9:30 ` [PATCH v2 3/3] rebase: introduce and use pseudo-ref ORIG_COMMIT Nguyễn Thái Ngọc Duy
2018-01-31 23:18 ` Junio C Hamano
2018-02-01 10:02 ` Duy Nguyen
2018-02-02 19:00 ` Junio C Hamano
2018-02-01 11:05 ` Phillip Wood
2018-02-11 9:43 ` [PATCH v3 0/3] Add "git rebase --show-current-patch" Nguyễn Thái Ngọc Duy
2018-02-11 9:43 ` [PATCH v3 1/3] am: add --show-current-patch Nguyễn Thái Ngọc Duy
2018-02-11 9:43 ` [PATCH v3 2/3] rebase: " Nguyễn Thái Ngọc Duy
2018-02-11 9:43 ` [PATCH v3 3/3] rebase: introduce and use pseudo-ref REBASE_HEAD Nguyễn Thái Ngọc Duy
2018-02-22 0:21 ` [PATCH v3 0/3] Add "git rebase --show-current-patch" Junio C Hamano
2018-02-22 0:54 ` Tim Landscheidt
2018-02-23 10:20 ` Duy Nguyen
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CACsJy8AH+xg3AB3qaqnFud4B8HHeyaO=8DqHL+p4HTTeSx6uYg@mail.gmail.com' \
--to=pclouds@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--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.
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 NNTP newsgroup(s).