Web lists-archives.com

Re: Diff topic branch + working copy changes?




On Wed, May 17, 2017 at 8:39 AM, Robert Dailey <rcdailey.lists@xxxxxxxxx> 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
>     dtb = "!f() { : git diff ; git difftool -d $(git merge-base
> @{upstream} HEAD) ; }; f"
>
> Since I use push.default = current, I always keep my upstream set to
> the parent branch (origin/master, origin/release/1.2.3, etc). So in my
> case these aliases work, but probably not for other push.default
> settings like 'upstream'.

Correction: settings like 'simple'

> 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
> --include-wc for diff or something.
>
> Thanks again!!