That seems like a failing of those GUIs. When you git rebase -i from the
command line, it opens $EDITOR with the logs of all the commits that are
being squashed, but that's intended to give you context as you rewrite them
into a single, meaningful commit message that expresses the changes.
Braden
Another thing that some Git GUIs do (like Tower) is when you squash, the
log of commits you squash are appended to the commit message. Ugly, and not
sure if its really useful for back-tracking purposes...
On Fri, Feb 28, 2014 at 7:16 PM, Michal Mocny wrote:
> Ian: I thought the point was to not
Ian: I thought the point was to not keep the original commits in tact 100%,
but rather to squish and clean them, in a way that keeps attribution.
I think Joe's question (and perhaps yours), is: is that okay to do? A
separate question is: how to use the tools to make sure this is obvious.
-Michal
If you're really concerned about keeping their commits intact, then you can
also do what I did with
https://github.com/apache/cordova-plugin-file/pull/30 --
I added her repo as a remote, and merged with --no-ff back into dev. That
kept all of the original commits intact, any my name goes on the me
Without --signoff, you already get set as the "committer", while the
author is maintained. You can verify this by running "coho last-week" and
see that it separates commits you wrote vs commits that you did from pull
requests. That said, adding "--signoff" couldn't hurt.
Squishing & fixing up doe
Does the squash keep original author info? I know the hashes change so
they don't match up, but if we have the author and a reference to the PR in
the commit, I think thats fine for me.
Alternative is to ask the contributor to do the squash, which we do try to
do, but its usually the non-responsi
Hey
I saw the wiki was updated, and I'm not quite sure how I feel about this:
https://wiki.apache.org/cordova/ProcessingPullRequests
# REPO_NAME example: "js"
# PULL_REQUEST_NUMBER example: "44"
curl https://github.com/apache/cordova-REPO_NAME/pull/PULL_REQUEST_NUMBER.patch
| git am
git rebase or
