News for hackers. Stuff that matters.

A comment on Git: Using Advanced Rebase Features for a Clean Repository. Parent comment

Re:Git: Using Advanced Rebase Features for a Clean Repository by 0xcoffee on Wednesday August 09, 2017 @08:33AM (#14967937)
I wish there was some happy medium, like that I can merge a branch and it gets squashed into a single commit, but then if needed I can 'expand' that commit to see its contents, even after the other branch is deleted.
[ Parent | on HN ]
Re:Git: Using Advanced Rebase Features for a Clean Repository by falsedan on Wednesday August 09, 2017 @10:33AM (#14969325)
That’s a rebased branch. You can see just the changed introduced by a branch:

  MERGE_COMMIT=$(git rev-parse :/“Merge .*$branchname”)
  git diff $MERGE_COMMIT^1..$MERGE_COMMIT^2
It never occurred to me that people prefer to squash so they can avoid the crummy UI of git diff
[ Parent | on HN ]