On Wed, 2017-11-01 at 10:34 +0530, Chetan Mehrotra wrote: > For external contributors it would be good if commit retains the > original author info. So I was thinking to follow approach mentioned > in [1]. In brief use > > - `git merge --no-ff feature` for feature branches involving multiple > commits > - `git cherry-pick feature` for simple bug fixes
+1 from me. Also it would be important IMO to ensure that 'fix-up' commits get squashed. Assume we have a PR with a simple commit that adds some Javadoc to a method. That commit introduces a typo, so another commit is added to the PR. I think the PR should be included as a single commit, not as two. Robert
