hawq-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Guo Gang <paul...@gmail.com>
Subject Re: About the commit
Date Tue, 28 Jun 2016 01:37:10 GMT
I usually does the following things before creating a pull request.

git pull --rebase $upstream master
git push -f $my_repo $my_branch
Then on github, create a pull request

This removes "Merge" commit, and make commits clean, and make
pull request easy.

In local repo,
Keep one commit only for multiple checkins: git commit --amend
or
Merge N commits into one: git reset --soft HEAD~N   +  git commit.

FYI.


2016-06-25 9:43 GMT+08:00 hong wu <xunzhangthu@gmail.com>:

> FYI: In new version of github
> <https://github.com/blog/2141-squash-your-commits>, committers could
> handle
> the squash process much more convenient.
>
> xunzhang
>
> 2016-06-25 9:30 GMT+08:00 hong wu <xunzhangthu@gmail.com>:
>
> > Hi HAWQ committers,
> >
> > I notice that there are some informal commits of recent check-in. For
> > example:
> > ce3f7c6b5c0315b97298d651f5d5f7383000491a
> > <
> https://github.com/apache/incubator-hawq/commit/ce3f7c6b5c0315b97298d651f5d5f7383000491a
> >
> > 4d44097085fd139002a255b1032082dc0b030414
> > <
> https://github.com/apache/incubator-hawq/commit/4d44097085fd139002a255b1032082dc0b030414
> >
> > 817249a4605abd4415fc0de8e6a545bf88d2aa2e
> > <
> https://github.com/apache/incubator-hawq/commit/817249a4605abd4415fc0de8e6a545bf88d2aa2e
> >
> > ...
> >
> > I think we'd better ensure a commit info starting with `HAWQ-#JIRA`. In
> > the following, I try to list the senses developer should pay attention
> to:
> > 1. To avoid commits generated automatically(for example
> > ce3f7c6b5c0315b97298d651f5d5f7383000491a
> > <
> https://github.com/apache/incubator-hawq/commit/ce3f7c6b5c0315b97298d651f5d5f7383000491a
> >),
> > do not merge or pull from upstream after local commits. Sync with
> upstream
> > master before your local commits.
> > 2. Check commits info before pushing into master. If you found a commit
> > with empty code change, rebase then squash it.
> > 3. If a pull request contains some informal commits(maybe for code review
> > convenience), committers should rebase then squash this temporary commits
> > before pushing into master.
> > 4. If you local develop branch is behind of upstream, it's ok. There are
> > some acceptable reasons for that. For example, during the discuss of your
> > pull request, the master branch is updated. But in this case, the asfgit
> > <https://github.com/asfgit> could not resolve it which means developers
> > should close your pull request manually. So I recommend to attach the
> pull
> > request number in your commits comments(For example
> > a57cc9523f97e471a69b658556c989d13ad88661
> > <
> https://github.com/apache/incubator-hawq/commit/a57cc9523f97e471a69b658556c989d13ad88661
> >
> > ).
> >
> > Best
> > xunzhang
> >
> >
>

Mime
  • Unnamed multipart/alternative (inline, None, 0 bytes)
View raw message