git初始设置

1解决不能输入密码问题,密码不能保存

git config --global credential.helper wincred

然后windows控制面板，管理凭据，删除遗留的凭据。

 

2解决git bash中文乱码问题 

git config --global i18n.commitencoding utf-8 

git config --global i18n.logoutputencoding utf-8

 

3最后user目录 .gitconfig文件大致如下：

[user]

name = ****

email = ***@*****

[http]

sslVerify = false

[credential]

helper = wincred

[i18n]

logOutputEncoding = utf-8

commitEncoding = utf-8

[fetch]

prune = true

[pull]

rebase = true

[core]

autocrlf = true

[diff]

  tool = tortoisediff

[difftool]

  prompt = false

[merge]

  tool = tortoisemerge

[mergetool]

  prompt = false

  keepBackup = false

[difftool "tortoisediff"]

  cmd = \""c:/Program Files/TortoiseGIT/bin/TortoiseGitMerge.exe"\" -mine "$REMOTE" -base "$LOCAL"

[mergetool "tortoisemerge"]

  cmd = \""c:/Program Files/TortoiseGIT/bin/TortoiseGitMerge.exe"\" -base "$BASE" -theirs "$REMOTE" -mine "$LOCAL" -merged "$MERGED"

[alias]

pl = pull --rebase

plpu = !git pull --rebase && git push

last = log -1 HEAD

co = checkout

br = branch -a

st = status

b = branch
dev = checkout develop
pushf = push --force-with-lease
pushr =!"var1=$(git symbolic-ref --short HEAD) && git push -u origin $var1"
reb = !"var2=$(git symbolic-ref --short HEAD) && git checkout develop && git pull --rebase && git checkout $var2 && git rebase -i develop" 

 

4.develop分支代码提交流程

git stash

git pull
git stash pop
或者git pull --rebase 
git push -u origin feature_branch_name