Show HN: Hiding code from Git diff

Re:Show HN: Hiding code from Git diff by neilparikh on Wednesday December 13, 2017 @09:16PM (#15919469)

I don't think you need to use rebase solve this issue at all. All you need to do is to make sure is that every commit on master, is on your feature branch, which you can still do with merging. Something like:

    git checkout my-branch
    git merge master

Whether you use rebase or merge is a completely orthogonal issue.

[ Parent | on HN ]

Re:Show HN: Hiding code from Git diff by orblivion on Thursday December 14, 2017 @01:20AM (#15920319)

Maybe I'm misunderstanding here. Who is going to run `git merge master`? If it's not you, the maintainer, then you need to trust that the submitter didn't pull any funny business with that command. With rebasing, you can just confirm that there are no merge commits.

[ Parent | on HN ]