Git常见问题

本地仓库使用如下命令初始化：

$ git init

之后使用如下命令添加远程库：

$ git remote addorigin git@github.com:hahah/ftpmanage.git

然后使用

$ git push -uorigin master

出现如下错误：

error: src refspecmaster does not match any.

error: failed topush some refs to 'git@github.com:hahaha/ftpmanage.git'

原因：

本地仓库为空

解决方法：使用如下命令添加文件；

$ git add add.phpaddok.php conn.php del.php edit.php editok.php ftpsql.sql index.php

$ git commit -m "initfiles"

windows出现错误：

warning: LF willbe replaced by CRLF

 

解决方法：

$ rm -rf .git  // 删除.git  

$ git config --global core.autocrlf false  //禁用自动转换    

重新执行

$ git init 

之后在push过程中出现如下错误：

$ git push -uorigin master

Warning:Permanently added the RSA host key for IP address 'xx.xx.xxx.xxx' to the list of known hosts.

Togit@github.com:hahaha/ftpmanage.git

 ! [rejected]        master -> master (fetch first)

error: failed topush some refs to 'git@github.com:hahahah/ftpmanage.git'

hint: Updates wererejected because the remote contains work that you do

hint: not havelocally. This is usually caused by another repository pushing

hint: to the same ref. You may want to first integrate the remote changes

hint: (e.g., 'git pull ...') before pushing again.

hint: See the 'Note about fast-forwards'in'git push --help'for details.

提示使用 git pull 之后在 push

使用如下命令解决：

$ git pull--rebase origin master
warning: no common commits
remote: Counting objects: 3, done.
remote: Total 3 (delta 0), reused 0 (delta 0), pack-reused 0
Unpacking objects: 100% (3/3), done.
From github.com:hahah/ftpmanage
 *branch           master     -> FETCH_HEAD
 * [new branch]     master     -> origin/master
First, rewinding head to replay your work on top of it...
Applying: init files

继续push，成功。

$ git push -uorigin master

Counting objects: 10, done.

Delta compression using up to 2 threads.

Compressingobjects: 100% (10/10), done.

Writing objects: 100% (10/10), 5.15 KiB | 0 bytes/s, done.

Total 10 (delta 3), reused 0(delta 0)

Togit@github.com:hahaha/ftpmanage.git

   a2b5c30..1044f15  master -> master

Branch master set up to track remote branch master fromorigin.