<html><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; line-break: after-white-space;" class=""><div style="caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);" class="">This is certainly useful, prior to this I was using </div><div style="caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);" class=""><br class=""></div><div style="caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);" class="">git diff $(git merge-base --fork-point main)</div><div style="caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);" class=""><br class=""></div><div style="caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0);" class="">To see branch changes (but this would dump all changes in all files in terminal, so quite unwieldy for large diffs)...</div><div class=""><br class=""></div><div class="">
<div dir="auto" style="caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0); letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none; word-wrap: break-word; -webkit-nbsp-mode: space; line-break: after-white-space;" class=""><div>Best regards,<br class=""><br class="">Jacob Faibussowitsch<br class="">(Jacob Fai - booss - oh - vitch)<br class="">Cell: (312) 694-3391</div></div>
</div>
<div style=""><br class=""><blockquote type="cite" class=""><div class="">On Mar 3, 2021, at 14:12, Satish Balay <<a href="mailto:balay@mcs.anl.gov" class="">balay@mcs.anl.gov</a>> wrote:</div><br class="Apple-interchange-newline"><div class=""><div class="">Also: sometimes I don't want to see the individual commits - just the overall change in this branch [aka the MR 'changes' view]<br class=""><br class="">git diff main...origin/jacobf/2020-09-09/feature/petscmapping/future<br class=""><br class="">Only diff for include/petsc.h<br class=""><br class="">git diff main...origin/jacobf/2020-09-09/feature/petscmapping/future include/petsc.h<br class=""><br class="">Satish<br class=""><br class=""><br class="">On Wed, 3 Mar 2021, Satish Balay via petsc-dev wrote:<br class=""><br class=""><blockquote type="cite" class="">And I frequently use it - for ex, to check (only) the commits in a branch - say origin/jacobf/2020-09-09/feature/petscmapping/future<br class=""><br class="">gitk main..origin/jacobf/2020-09-09/feature/petscmapping/future<br class=""><br class="">[equivalent to "git log main..origin/jacobf/2020-09-09/feature/petscmapping/future"]<br class=""><br class="">And then check the diffs for individual commit (as needed) via this interface<br class=""><br class="">Check only the diffs for changes to include/petsc.h in this branch<br class=""><br class="">gitk main..origin/jacobf/2020-09-09/feature/petscmapping/future include/petsc.h<br class=""><br class="">Satish<br class=""><br class="">On Wed, 3 Mar 2021, Jacob Faibussowitsch wrote:<br class=""><br class=""><blockquote type="cite" class=""><blockquote type="cite" class="">'gitk' is easier to read [for me] than 'git log --graph'<br class=""></blockquote><br class="">Where was this my entire life… best kept git secret!<br class=""><br class="">Best regards,<br class=""><br class="">Jacob Faibussowitsch<br class="">(Jacob Fai - booss - oh - vitch)<br class="">Cell: (312) 694-3391<br class=""><br class=""><blockquote type="cite" class="">On Mar 3, 2021, at 13:55, Satish Balay <<a href="mailto:balay@mcs.anl.gov" class="">balay@mcs.anl.gov</a>> wrote:<br class=""><br class="">'gitk' is easier to read [for me] than 'git log --graph'<br class=""><br class="">Satish<br class=""><br class="">On Wed, 3 Mar 2021, Jacob Faibussowitsch wrote:<br class=""><br class=""><blockquote type="cite" class=""><blockquote type="cite" class="">git: 'graph' is not a git command. See 'git --help'.<br class=""></blockquote><br class="">I have it as an alias:<br class=""><br class="">graph = !git log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative<br class=""><br class="">Best regards,<br class=""><br class="">Jacob Faibussowitsch<br class="">(Jacob Fai - booss - oh - vitch)<br class="">Cell: (312) 694-3391<br class=""><br class=""><blockquote type="cite" class="">On Mar 3, 2021, at 13:50, Mark Adams <<a href="mailto:mfadams@lbl.gov" class="">mfadams@lbl.gov</a>> wrote:<br class=""><br class=""><br class=""><br class="">On Tue, Mar 2, 2021 at 10:02 PM Junchao Zhang <<a href="mailto:junchao.zhang@gmail.com" class="">junchao.zhang@gmail.com</a> <<a href="mailto:junchao.zhang@gmail.com" class="">mailto:junchao.zhang@gmail.com</a>>> wrote:<br class="">I am a naive git user, so I use interactive git rebase. Suppose I am on the branch I want to modify, <br class=""><br class="">1) Use git graph to locate an upstream commit to be used as the base<br class="">$ git graph<br class=""><br class="">Humm ....<br class=""><br class="">14:49 adams/cusparse-lu-landau= /gpfs/alpine/csc314/scratch/adams/petsc$ git --version<br class="">git version 2.20.1<br class="">14:49 adams/cusparse-lu-landau= /gpfs/alpine/csc314/scratch/adams/petsc$ git graph<br class="">git: 'graph' is not a git command. See 'git --help'.<br class=""><br class="">The most similar commands are<br class="">branch<br class="">grep<br class=""><br class=""></blockquote><br class=""><br class=""></blockquote><br class=""></blockquote><br class=""><br class=""></blockquote><br class=""></blockquote></div></div></blockquote></div><br class=""></body></html>