> Uwe Brauer <o...@mat.ucm.es> writes:
> I guess Mosè does like me. Say in your experimental branch you develop
> a new feature. Instead of merging that branch with master (which just
> follows origin/master without changes), we do
> $ git rebase master
> and as a result, our 20 new, unpublished commits in our local
> experimental branch are always the top of that branch's history.
> Therefore we can easily squash them into one commit when the feature is
> finally done. This single commit can then be merged into master and be
> pushed (or sent as a patch to this mailing list).
> Then, for anybody else except for you, it looks like this feature has
> been implemented with one single commit.
Ok, one last question then. I have found the equivalent hg command for that
procedure but before sending that patch I would like to check it with
git on my local git clone of auctex.
Here is what I have done so far.
I generated my patch (I meant to one with various changesets)
I clone again with git and with hg the latest auctex repo.
I apply my patch
In hg: hg import mynewpatch.patch
Hg log -G
Shows my three changesets (so your complain is confirmed)
git am --patch-format=hg mynewpatch.patch
And git log --graph
Tells me only one commit and one changeset.
The question is what git command will show me how many changesets are
included in my patch, because git log did not.
auctex-devel mailing list