However, when you're on a tracking merge only "git pull" will merge the
right branch automatically into the current branch, fetching the branch
name to merge from the config. If the branch.*.remote config key is
".", it will do a local merge.
Note that "git pull ." is optimized in that the fetch does nothing
except setting up MERGE_HEAD.
Paolo
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html