search

sergi / go-diff

Diff, match and patch text in Go
MIT License
1.81k stars 207 forks source link

Use grep -E in lint.sh to make it compatible with BSD grep #67

Closed maksimov closed 7 years ago

zimmski commented 7 years ago

Please squash bf5b7ce905d084b27c0a5d5dd337944542768846 into the previous commit to keep the history clean.

maksimov commented 7 years ago

I'm not sure if this is better, since I now have a merge commit there too. Shall I just nuke it and do it again? AFAIK, you can also squash while merging on Github.

zimmski commented 7 years ago

I am not really sure how the squash feature behaves on GitHub. I will take a look. For example how do they handle signed commits?

For this PR I meant the squash functionality of git using rebase. Maybe you can have a look at https://git-scm.com/book/en/v2/Git-Tools-Rewriting-History#Squashing-Commits Fixups (can be also don in the interactive rebase mode) is also a great way of squashing commits http://fle.github.io/git-tip-keep-your-branch-clean-with-fixup-and-autosquash.html

maksimov commented 7 years ago

That's how I did it, but then I had to rebase with my fork so this is how there's a merge commit.

zimmski commented 7 years ago

I tried out the squash feature. To be honest, I rather prefer to do merges in the future. The information on where the commit came from is lost.

If you have a merge commit a merge was somehow issues, e.g., via pull. Did you try "git checkout --all --prune && git checkout yourbranch && git rebase yourforksremotename/master"? That usually does it for me.

Anyway, thanks for the PR! I really appreciate it :-)

maksimov commented 7 years ago

Wow, never did anything like that. My upstream didn't mind an extra commit. Btw, I notice that merge commit didn't really show up on Github, and you can't really get away without them where more than one person is making changes to the upstream. Anyway, I'll try your suggestion next time. Thanks!