Merge branch 'master' of https://github.com/candera/emacs

sumbach · Aug 18, 2011 · 6bec399 · 6bec399
2 parents eb654c2 + 825c925
commit 6bec399
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -15,7 +15,7 @@
 	url = https://github.com/superbobry/io-mode.git
 [submodule "magit"]
 	path = magit
-	url = https://github.com/philjackson/magit.git
+	url = https://github.com/magit/magit.git
 [submodule "slime-2010-05-19"]
 	path = slime-2010-05-19
 	url = git://git.boinkor.net/slime.git

diff --git a/init.el b/init.el
@@ -689,6 +689,8 @@
 ;; emacs, whereas I run magit-status all the time
 (global-set-key (kbd "C-x m") 'magit-status)
 
+(setq magit-default-tracking-name-function 'magit-default-tracking-name-branch-only)
+
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
 ;; Set up gist.el

diff --git a/magit b/magit