Notable Git 1.7.6 Updates 15 Sep 2011
git merge now supports the ndash alias:

Liquid error: No such file or directory - posix_spawnp

Also, git checkout also supports the ndash alias which refers to the previous branch.

The above example also works without ––no–merge. Speaking of ––no–merge, you can now configure it in your git config and stop passing it in with every command line merge.

Liquid error: No such file or directory - posix_spawnp

From the gitlog:

“git merge” uses “merge.ff” configuration variable to decide to always create a merge commit (i.e. ––no–ff, aka merge.ff=no), refuse to create a merge commit (i.e. ––ff–only, aka merge.ff=only). Setting merge.ff=yes (or not setting it at all) restores the default behaviour of allowing fast–forward to happen when possible.


blog comments powered by Disqus