From: Johannes Schindelin Date: Mon, 29 Jan 2018 15:09:53 GMT Subject: Re: [PATCH 0/2] Add "git rebase --show-patch" Message-ID: In-Reply-To: <20180126095520.919-1-pclouds@gmail.com> 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. Ciao, Dscho