Re: Diff topic branch + working copy changes?

On Wed, May 17, 2017 at 9:39 AM, Robert Dailey wrote: > > Would be nice in the future to have another revision specification > like @{wc} for "HEAD + working copy". I guess this technically isn't a > revision, but something along those lines. Or maybe just an >

Re: Diff topic branch + working copy changes?

On Wed, May 17, 2017 at 8:39 AM, Robert Dailey wrote: > Thanks Junio, I forgot about merge-base. I'll create some aliases for now: > > # Diff Branch > db = "!f() { : git diff ; git diff $(git merge-base @{upstream} > HEAD) ; }; f" > > # Diff Tool Branch >

Re: Diff topic branch + working copy changes?

On Tue, May 16, 2017 at 9:47 PM, Junio C Hamano wrote: > Robert Dailey writes: > >> So for a topic branch based on master, I can diff ONLY my changes on >> the topic branch by doing this simple command: >> >> $ git diff origin/master... >> >> However,

Re: Diff topic branch + working copy changes?

Robert Dailey writes: > So for a topic branch based on master, I can diff ONLY my changes on > the topic branch by doing this simple command: > > $ git diff origin/master... > > However, this does not include uncommitted working copy changes. To > work around this, I

Diff topic branch + working copy changes?

So for a topic branch based on master, I can diff ONLY my changes on the topic branch by doing this simple command: $ git diff origin/master... However, this does not include uncommitted working copy changes. To work around this, I can do this instead: $ git diff origin/master (No three-dot