sonyet 发表于 2018-1-13 06:32:48

idea中如何配置git以及在idea中初始化git

  idea中如何配置git以及在idea中初始化git呢:
  参考此博文:
  http://blog.csdn.net/qq_28867949/article/details/73012300
  *为了这个问题折腾了半天...在这里记录下,方便大参考,欢迎评论提出宝贵意见,谢谢!**
  问题说明:


  解决方法一:
  ◆打开IDEA,按照路径Fie--》Settings --》 Tools --》Terminal 找到后设置右边的Shell path(自己安装的Git路径下相对位置),如下图所示
  
  
  不完美之处:当我们点击idea中的Terminal终端时,会自动弹出Windows安装的bash窗口,如下图所示:

  解决方法二:
  ◆更改路径即可
git\bin\bash.exe
或 Git\bin\sh.exe
然后重新启动idea即可
  
  
  ********************88注意:每次更改完成后需要重新启动IDEA******************
  =============================记录End=============================
  git在idea中使用:
  (1)创建README.md文件
  fengli@DESKTOP-FEQ1N4I MINGW32 /f/workspace/imallproject (master)
  $ touch README.md
  (2)创建.gitignore文件(用于忽略上传的文件)
  

#提交到码云上面忽略的东西配置  

  
*.class
  
#package file
  
*.war
  
*.ear
  
*.orig
  

  
target/
  
.settings/
  
.project
  
.classpath
  

  
.idea/
  
/idea/
  
*.ipr
  
*.iml
  
*.iws
  

  
*.log
  
*.cache
  
*.diff
  
*.patch
  
*.tmp
  

  
.DS_Store
  
Thumbs.db
  

  

  fengli@DESKTOP-FEQ1N4I MINGW32 /f/workspace/imallproject (master)
  $ touch .gitignore
  (3)初始化git
  fengli@DESKTOP-FEQ1N4I MINGW32 /f/workspace/imallproject (master)
  $ git init
  Initialized empty Git repository in F:/workspace/imallproject/.git/
  fengli@DESKTOP-FEQ1N4I MINGW32 /f/workspace/imallproject (master)
  查看git状态:现在是在master上(一般分支开发主干合并)
  $ git status
  On branch master
  (4)commit提示错误,先git add一下
  Initial commit
  Untracked files:
  (use "git add <file>..." to include in what will be committed)
  .gitignore
  README.md
  pom.xml
  src/
  nothing added to commit but untracked files present (use "git add" to track)
  fengli@DESKTOP-FEQ1N4I MINGW32 /f/workspace/imallproject (master)
  $ git add .
  fengli@DESKTOP-FEQ1N4I MINGW32 /f/workspace/imallproject (master)
  $ git status
  On branch master
  Initial commit
  Changes to be committed:
  (use "git rm --cached <file>..." to unstage)
  new file:   .gitignore
  new file:   README.md
  new file:   pom.xml
  new file:   src/main/webapp/WEB-INF/web.xml
  new file:   src/main/webapp/index.jsp
  fengli@DESKTOP-FEQ1N4I MINGW32 /f/workspace/imallproject (master)
  $ git commit -am 'first commit '
first commit
  5 files changed, 65 insertions(+)
  create mode 100644 .gitignore
  create mode 100644 README.md
  create mode 100644 pom.xml
  create mode 100644 src/main/webapp/WEB-INF/web.xml
  create mode 100644 src/main/webapp/index.jsp
  git连接到码云仓库:
  fengli@DESKTOP-FEQ1N4I MINGW32 /f/workspace/imallproject (master)
  $ git remote add origin git@git.oschina.net:marrymayun/imalllearning.git
  fengli@DESKTOP-FEQ1N4I MINGW32 /f/workspace/imallproject (master)
  $ git branch
  * master
  (5)推送
  fengli@DESKTOP-FEQ1N4I MINGW32 /f/workspace/imallproject (master)
  $ git push -u origin master
  The authenticity of host 'git.oschina.net (120.55.226.24)' can't be established.
  ECDSA key fingerprint is SHA256:FQGC9Kn/eye1W8icdBgrQp+KkGYoFgbVr17bmjey0Wc.
  Are you sure you want to continue connecting (yes/no)? no
  Host key verification failed.
  fatal: Could not read from remote repository.
  Please make sure you have the correct access rights
  and the repository exists.
  fengli@DESKTOP-FEQ1N4I MINGW32 /f/workspace/imallproject (master)
  $ git pull
  The authenticity of host 'git.oschina.net (120.55.226.24)' can't be established.
  ECDSA key fingerprint is SHA256:FQGC9Kn/eye1W8icdBgrQp+KkGYoFgbVr17bmjey0Wc.
  Are you sure you want to continue connecting (yes/no)? yes
  Warning: Permanently added 'git.oschina.net,120.55.226.24' (ECDSA) to the list of known hosts.
  warning: no common commits
  remote: Counting objects: 4, done.
  remote: Compressing objects: 100% (3/3), done.
  remote: Total 4 (delta 0), reused 0 (delta 0)
  Unpacking objects: 100% (4/4), done.
  From git.oschina.net:marrymayun/imalllearning
  *       master   -> origin/master
  There is no tracking information for the current branch.
  Please specify which branch you want to merge with.
  See git-pull(1) for details.
  git pull <remote> <branch>
  If you wish to set tracking information for this branch you can do so with:
  git branch --set-upstream-to=origin/<branch> master
  fengli@DESKTOP-FEQ1N4I MINGW32 /f/workspace/imallproject (master)
  $ git push -u -f origin master
  Counting objects: 11, done.
  Delta compression using up to 4 threads.
  Compressing objects: 100% (7/7), done.
  Writing objects: 100% (11/11), 1.29 KiB | 0 bytes/s, done.
  Total 11 (delta 0), reused 0 (delta 0)
  To git@git.oschina.net:marrymayun/imalllearning.git
  + a5a27d2...5ef0663 master -> master (forced update)
  Branch master set up to track remote branch master from origin.
  fengli@DESKTOP-FEQ1N4I MINGW32 /f/workspace/imallproject (master)
  $ git branch
  * master
  fengli@DESKTOP-FEQ1N4I MINGW32 /f/workspace/imallproject (master)
  $ git branch -r
  origin/master
  在master下创建分支v1.0
  fengli@DESKTOP-FEQ1N4I MINGW32 /f/workspace/imallproject (master)
  $ git checkout -b v1.0 origin/master
  Branch v1.0 set up to track remote branch master from origin.
  Switched to a new branch 'v1.0'
  fengli@DESKTOP-FEQ1N4I MINGW32 /f/workspace/imallproject (v1.0)
  $ git branch
  master
  * v1.0
  推送到分支,我们在分支开发,主干合并
  fengli@DESKTOP-FEQ1N4I MINGW32 /f/workspace/imallproject (v1.0)
  $ git push origin HEAD -u
  Total 0 (delta 0), reused 0 (delta 0)
  To git@git.oschina.net:marrymayun/imalllearning.git
  *       HEAD -> v1.0
  Branch v1.0 set up to track remote branch v1.0 from origin.
  fengli@DESKTOP-FEQ1N4I MINGW32 /f/workspace/imallproject (v1.0)
  $
  完成:
https://images2015.cnblogs.com/blog/998342/201706/998342-20170630145037633-382094450.png
  至此在idea中初始化git完成。
页: [1]
查看完整版本: idea中如何配置git以及在idea中初始化git