Zsh Mailing List Archive
Messages sorted by: Reverse Date, Date, Thread, Author

Re: Access to CVS



On 07/12/2012 16:11, Aaron Schrab wrote:
> Also, this would not be convenient for the submitter of the pull
> request.  If a normal merge is done, it is easy for the submitter (or
> other people) to determine that the branch was fully merged, since the
> submitted commits are part of the history.  With --squash, if the
> submitter wants to determine if the changes were merged as-is or if
> further modifications were done a more thorough examination would need
> to be done, especially if the merge was done on top of a different
> commit than where the original branch was based.

Well you can merge back master into your branch, then git diff master
will tell if there are still differences...
But it's unhandy.

François.



Messages sorted by: Reverse Date, Date, Thread, Author