[petsc-dev] Commit squashing in MR

[Satish Balay]

Also: sometimes I don't want to see the individual commits - just the overall change in this branch [aka the MR 'changes' view]

git diff main...origin/jacobf/2020-09-09/feature/petscmapping/future

Only diff for include/petsc.h

git diff main...origin/jacobf/2020-09-09/feature/petscmapping/future include/petsc.h

Satish


On Wed, 3 Mar 2021, Satish Balay via petsc-dev wrote:

> And I frequently use it - for ex, to check (only) the commits in a branch - say origin/jacobf/2020-09-09/feature/petscmapping/future
> 
> gitk main..origin/jacobf/2020-09-09/feature/petscmapping/future
> 
> [equivalent to "git log main..origin/jacobf/2020-09-09/feature/petscmapping/future"]
> 
> And then check the diffs for individual commit (as needed) via this interface
> 
> Check only the diffs for changes to include/petsc.h in this branch
> 
> gitk main..origin/jacobf/2020-09-09/feature/petscmapping/future include/petsc.h
> 
> Satish
> 
> On Wed, 3 Mar 2021, Jacob Faibussowitsch wrote:
> 
> > > 'gitk' is easier to read [for me] than 'git log --graph'
> > 
> > Where was this my entire life… best kept git secret!
> > 
> > Best regards,
> > 
> > Jacob Faibussowitsch
> > (Jacob Fai - booss - oh - vitch)
> > Cell: (312) 694-3391
> > 
> > > On Mar 3, 2021, at 13:55, Satish Balay <balay at mcs.anl.gov> wrote:
> > > 
> > > 'gitk' is easier to read [for me] than 'git log --graph'
> > > 
> > > Satish
> > > 
> > > On Wed, 3 Mar 2021, Jacob Faibussowitsch wrote:
> > > 
> > >>> git: 'graph' is not a git command. See 'git --help'.
> > >> 
> > >> I have it as an alias:
> > >> 
> > >> 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
> > >> 
> > >> Best regards,
> > >> 
> > >> Jacob Faibussowitsch
> > >> (Jacob Fai - booss - oh - vitch)
> > >> Cell: (312) 694-3391
> > >> 
> > >>> On Mar 3, 2021, at 13:50, Mark Adams <mfadams at lbl.gov> wrote:
> > >>> 
> > >>> 
> > >>> 
> > >>> On Tue, Mar 2, 2021 at 10:02 PM Junchao Zhang <junchao.zhang at gmail.com <mailto:junchao.zhang at gmail.com>> wrote:
> > >>> I am a naive git user, so I use interactive git rebase.  Suppose I am on the branch I want to modify, 
> > >>> 
> > >>> 1) Use git graph to locate an upstream commit to be used as the base
> > >>> $ git graph
> > >>> 
> > >>> Humm ....
> > >>> 
> > >>> 14:49 adams/cusparse-lu-landau= /gpfs/alpine/csc314/scratch/adams/petsc$ git --version
> > >>> git version 2.20.1
> > >>> 14:49 adams/cusparse-lu-landau= /gpfs/alpine/csc314/scratch/adams/petsc$ git graph
> > >>> git: 'graph' is not a git command. See 'git --help'.
> > >>> 
> > >>> The most similar commands are
> > >>> branch
> > >>> grep
> > >>> 
> > >> 
> > >> 
> > > 
> > 
> > 
>