[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bug#43725: 28.0.50; Include feature/native-comp into master
From: |
Andrea Corallo |
Subject: |
bug#43725: 28.0.50; Include feature/native-comp into master |
Date: |
Thu, 01 Oct 2020 13:40:27 +0000 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) |
Eli Zaretskii <eliz@gnu.org> writes:
>> Cc: 43725@debbugs.gnu.org
>> Date: Thu, 01 Oct 2020 07:51:16 +0000
>> From: Andrea Corallo via "Bug reports for GNU Emacs,
>> the Swiss army knife of text editors" <bug-gnu-emacs@gnu.org>
>>
>> > git diff origin/feature/native-comp..origin/master
>> >
>> > ?
>>
>> I think something like this would add into the diff all new commits that
>> where pushed to master.
>>
>> One option is to do the same but against the last commit from master
>> included into the branch (it's easy to identify as just under the last
>> merge). ATM would be:
>>
>> git diff 6c0f1c26d2...origin/feature/native-comp
>
> I suggest this:
>
> git diff ...origin/feature/native-comp
>
> That's how I always produce changes introduced by a branch that
> diverged from the current branch.
Wow that's very handy thanks.
Expanding what you have posted this should work regardless what is the
current checkouted branch:
git diff $(git merge-base origin/master
origin/feature/native-comp)..origin/feature/native-comp
- bug#43725: 28.0.50; Include feature/native-comp into master, Andrea Corallo, 2020/10/01
- bug#43725: 28.0.50; Include feature/native-comp into master, Andrea Corallo, 2020/10/02
- bug#43725: 28.0.50; Include feature/native-comp into master, Eli Zaretskii, 2020/10/02
- bug#43725: 28.0.50; Include feature/native-comp into master, Andrea Corallo, 2020/10/02
- bug#43725: 28.0.50; Include feature/native-comp into master, Eli Zaretskii, 2020/10/03
- bug#43725: 28.0.50; Include feature/native-comp into master, Lars Ingebrigtsen, 2020/10/03
- bug#43725: 28.0.50; Include feature/native-comp into master, Andrea Corallo, 2020/10/03
- bug#43725: 28.0.50; Include feature/native-comp into master, Andrea Corallo, 2020/10/06
- bug#43725: 28.0.50; Include feature/native-comp into master, Lars Ingebrigtsen, 2020/10/07
- bug#43725: 28.0.50; Include feature/native-comp into master, Andrea Corallo, 2020/10/07