clone した場合と init して remote add した場合で設定が異なるらしいが
詳しくは下記リンク
clone
$ git clone <repos>
remote add
$ git init $ git remote add origin <repos>
設定とか関係なく pull origin master とかすればよいみたい
$ git pull origin master
メモ
$ git push origin master To ssh://hoge/hoge.git ! [rejected] master -> master (non-fast-forward) error: failed to push some refs to 'ssh://hoge/hoge.git' To prevent you from losing history, non-fast-forward updates were rejected Merge the remote changes (e.g. 'git pull') before pushing again. See the 'Note about fast-forwards' section of 'git push --help' for details. $ git pull You have not concluded your merge (MERGE_HEAD exists). Please, commit your changes before you can merge $ git reset --merge $ git pull origin master From ssh://hoge/hoge * branch master -> FETCH_HEAD Merge made by the 'recursive' strategy. app/controllers/hoge_controller.rb | 1 + 1 file changed, 1 insertion(+) $ git push origin master Counting objects: 26, done. Delta compression using up to 2 threads. Compressing objects: 100% (13/13), done. Writing objects: 100% (14/14), 1.43 KiB, done. Total 14 (delta 10), reused 0 (delta 0) To ssh://hoge/hoge.git 6d476d2..fcb00a6 master -> master $
.gitconfig の設定 Emacs.app の場合
ここの設定を変えたら直ったかも?
[core] # editor = emacs editor = "open -a Emacs"
追記:下記記事を参照