Merge branch 'master' of ssh://tmux.git.sourceforge.net/gitroot/tmux/tmux

Conflicts: SYNCING
2012-09-20 23:02:49 +01:00 · 2012-09-20 23:02:49 +01:00 · dc3df931d7
parent d3d48fa3e7 73f29094d0
commit dc3df931d7
1 changed files with 1 additions and 1 deletions
--- a/2
+++ b/2
@ -99,7 +99,7 @@ line, as in:

 % cd /path/to/tmux
 % git config --add remote.origin.fetch '+refs/replace/*:refs/replace/*'
-% git fetch origin --all
+% git fetch origin

 Performing the Sync
 ===================