Merge-optional feature request about git-tfs

[ivan-danilov]

I've already made something that could help you here: https://github.com/ivan-danilov/git-tfs/tree/rebase-workflow
It is doing exactly what you've said plus rebases tail of your HEAD (after the commit you're checking in TFS) onto new tfs/default - so you can run series of checkins from git to tfs and have just smooth history.

The key is "--rebase-workflow" or "-r".

Unfortunately it still not helps with redundant conversions because pulling from other git repository will bring new commits from TFS but won't change your tfs/default ref. I'm working on this now.
Currently I've made a workaround: in ivan-danilov@5cb36da after pulling you could execute "git tfs bootstrap" and it will update your ref further. I just want to make 'git tfs fetch' does this itself before fetching. Probably will commit this today in several hours.

[ivan-danilov]

Here it is: https://github.com/ivan-danilov/git-tfs/commits/redundant-fetch
--rebase-workflow is already merged in the redundant-fetch branch

[ivan-danilov]

I think that with recent rcheckin and checkin --no-merge additions this issue should be closed.