I can't really ever think of a time when I would use git merge rather than git rebase and not want to have a commit show up. Is there any way to configure git to have fast forwarding off by default? The fact that there's an --ff option would seem to imply that there's a way, but I can't seem to find it in the documentation. ...
Coming from mercurial, I'm using branches to organize features. Naturally I want to see this work-flow in my history as well. But I started my new project with git and finished a feature. After merging I realized that git used fast-forward and forgot about my branch. So to think into the future: I'm the only one working on this project....
I periodically get message from git that look like this: Your branch is behind the tracked remote branch 'local-master/master' by 3 commits, and can be fast-forwarded. I would like to be able to write commands in a shell script that can do the following: How can I tell if my current branch can be fast-forwarded from the remote bran...
I have two branches, and I am merging branch1 into branch2 with a no fast-forward. After the merge, I run the command 'git show', I only get the message that of the commit (which is the merge from the no fast-forward) and no list files that changed. How do I get the list files changed in the merge? SOLVED: When at branch2 after th...
I am creating a SQL 2008 R2 stored procedure to duplicate a row and all it's children. It's a 3-tiered setup with a Parent, Child and Sub-Child Given the ID of the parent I need to create a duplicate. I have solved it using a fast_forward cursor. I know I can also do it with a while loop through rows but I do not believe that will be...