Ah ok, what I do usually is to rebase current master on top of my PR branch, then merge to master for pushing the change.
- Henry On Thu, Jan 15, 2015 at 12:26 PM, Aljoscha Krettek <aljos...@apache.org> wrote: > I meant rebasing the commits in a PR on top of the current master. So > that you don't need a merge commit and the history looks linear. > > On Thu, Jan 15, 2015 at 9:17 PM, Henry Saputra <henry.sapu...@gmail.com> > wrote: >> Ah, so you were rebasing against a PR branch? >> >> - Henry >> >> On Thu, Jan 15, 2015 at 10:42 AM, Aljoscha Krettek <aljos...@apache.org> >> wrote: >>> But you don't lose the original author information when rebasing. >>> >>> On Thu, Jan 15, 2015 at 7:28 PM, Ted Dunning <ted.dunn...@gmail.com> wrote: >>>> On Thu, Jan 15, 2015 at 10:18 AM, Henry Saputra <henry.sapu...@gmail.com> >>>> wrote: >>>> >>>>> I do use Git rebase before pushing my own PRs. >>>>> >>>>> So, no one uses the script to merge PRs? >>>>> >>>>> I will send update to the script to fix it. >>>>> >>>> >>>> Manual rebase is a good standard of practice. I like looking in detail at >>>> what I am doing.
