discuss@lists.openscad.org

OpenSCAD general discussion Mailing-list

View all threads

Github compare across branches

NH
nop head
Sat, Jan 16, 2016 12:01 PM

Sorry for an off topic question but there must be some Github experts on
this list.

I want to compare the heads of two branches and show all the file
differences. Github compare seems to do something different and is not
commutative. For example
https://github.com/openscad/openscad/compare/master...c++11 is not the same
as https://github.com/openscad/openscad/compare/c++11...master. I would
expect it to simply to swap left and right making additions deletions, etc.

I think it must find the point where the branches diverged and show the
difference of one branch with respect to that. Is there a way to show the
difference between the two heads?

Sorry for an off topic question but there must be some Github experts on this list. I want to compare the heads of two branches and show all the file differences. Github compare seems to do something different and is not commutative. For example https://github.com/openscad/openscad/compare/master...c++11 is not the same as https://github.com/openscad/openscad/compare/c++11...master. I would expect it to simply to swap left and right making additions deletions, etc. I think it must find the point where the branches diverged and show the difference of one branch with respect to that. Is there a way to show the difference between the two heads?
NH
nop head
Sat, Jan 16, 2016 12:40 PM

Looks like it should be two dots instead of three in git diff but Github
compare doesn't support it, bummer!

On 16 January 2016 at 12:01, nop head nop.head@gmail.com wrote:

Sorry for an off topic question but there must be some Github experts on
this list.

I want to compare the heads of two branches and show all the file
differences. Github compare seems to do something different and is not
commutative. For example
https://github.com/openscad/openscad/compare/master...c++11 is not the
same as https://github.com/openscad/openscad/compare/c++11...master. I
would expect it to simply to swap left and right making additions
deletions, etc.

I think it must find the point where the branches diverged and show the
difference of one branch with respect to that. Is there a way to show the
difference between the two heads?

Looks like it should be two dots instead of three in git diff but Github compare doesn't support it, bummer! On 16 January 2016 at 12:01, nop head <nop.head@gmail.com> wrote: > Sorry for an off topic question but there must be some Github experts on > this list. > > I want to compare the heads of two branches and show all the file > differences. Github compare seems to do something different and is not > commutative. For example > https://github.com/openscad/openscad/compare/master...c++11 is not the > same as https://github.com/openscad/openscad/compare/c++11...master. I > would expect it to simply to swap left and right making additions > deletions, etc. > > I think it must find the point where the branches diverged and show the > difference of one branch with respect to that. Is there a way to show the > difference between the two heads? >
MK
Marius Kintel
Sat, Jan 16, 2016 4:36 PM

On Jan 16, 2016, at 07:40 AM, nop head nop.head@gmail.com wrote:

Looks like it should be two dots instead of three in git diff but Github compare doesn't support it, bummer!

Yep, that’s correct.
You can simply do that on the cmd-line though: git diff origin/c++11..origin/master
There might be git GUI wrappers showing a graphical diff as well, but I don’t generally use those.

-Marius

> On Jan 16, 2016, at 07:40 AM, nop head <nop.head@gmail.com> wrote: > > Looks like it should be two dots instead of three in git diff but Github compare doesn't support it, bummer! > Yep, that’s correct. You can simply do that on the cmd-line though: git diff origin/c++11..origin/master There might be git GUI wrappers showing a graphical diff as well, but I don’t generally use those. -Marius
NH
nop head
Sat, Jan 16, 2016 9:19 PM

Odd they don't support it. I even found some of their code that converted
two dots to three dots. It seems a massive gap in functionality and very
easy to implement if they use git as in their back end.

The reason I like using github compare is because it can show image
differences and STL differences graphically. I might have to create a dummy
repository and check in the files I want to compare sequentially and then
delete it again.

On 16 January 2016 at 16:36, Marius Kintel marius@kintel.net wrote:

On Jan 16, 2016, at 07:40 AM, nop head nop.head@gmail.com wrote:

Looks like it should be two dots instead of three in git diff but Github

compare doesn't support it, bummer!

Yep, that’s correct.
You can simply do that on the cmd-line though: git diff
origin/c++11..origin/master
There might be git GUI wrappers showing a graphical diff as well, but I
don’t generally use those.

-Marius


OpenSCAD mailing list
Discuss@lists.openscad.org
http://lists.openscad.org/mailman/listinfo/discuss_lists.openscad.org

Odd they don't support it. I even found some of their code that converted two dots to three dots. It seems a massive gap in functionality and very easy to implement if they use git as in their back end. The reason I like using github compare is because it can show image differences and STL differences graphically. I might have to create a dummy repository and check in the files I want to compare sequentially and then delete it again. On 16 January 2016 at 16:36, Marius Kintel <marius@kintel.net> wrote: > > On Jan 16, 2016, at 07:40 AM, nop head <nop.head@gmail.com> wrote: > > > > Looks like it should be two dots instead of three in git diff but Github > compare doesn't support it, bummer! > > > Yep, that’s correct. > You can simply do that on the cmd-line though: git diff > origin/c++11..origin/master > There might be git GUI wrappers showing a graphical diff as well, but I > don’t generally use those. > > -Marius > > > _______________________________________________ > OpenSCAD mailing list > Discuss@lists.openscad.org > http://lists.openscad.org/mailman/listinfo/discuss_lists.openscad.org >