On Wed, Aug 24, 2016 at 01:48:30PM -0700, Jacob Keller wrote:
> On Wed, Aug 24, 2016 at 9:22 AM, Junio C Hamano wrote:
> > The merge-base is to compute the point you forked your topic from
> > the mainline. So if you want to compare your current state in the
> > index with the fork point, you'd
On Wed, Aug 24, 2016 at 9:22 AM, Junio C Hamano wrote:
> The merge-base is to compute the point you forked your topic from
> the mainline. So if you want to compare your current state in the
> index with the fork point, you'd do
>
> git diff --cached $(git merge-base master topic)
>
> and
Robert Dailey writes:
> $ git diff master...topic
... which is defined roughly as
git diff $(git merge-base master topic) topic
The merge-base is to compute the point you forked your topic from
the mainline. So if you want to compare your current state in the
index with the fork point
On Wed, Aug 24, 2016 at 11:00 AM, Michael J Gruber
wrote:
> The 3-dot notation means:
>
> Show the difference between the merge-base of master and topic, and topic.
>
> I'm not completely sure, but I guess what you want is:
>
> Show the difference between the merge-base of master and topic, and th
Robert Dailey venit, vidit, dixit 24.08.2016 16:28:
> I want to view the complete diff of my branch (topic) relative to its
> parent branch (master). This should include cached/staged files and
> unstaged working tree changes.
>
> If I do this:
>
> $ git diff master
>
> This will include changes
I want to view the complete diff of my branch (topic) relative to its
parent branch (master). This should include cached/staged files and
unstaged working tree changes.
If I do this:
$ git diff master
This will include changes on master *since* my last merge, which I do
not want (I don't want to
6 matches
Mail list logo
