《Pro Git》 读书笔记1

Config file location
    --global              use global config file
    --system              use system config file
    --local               use repository config file
    -f, --file <file>     use given config file
    --blob <blob-id>      read config from given blob object

Action
    --get                 get value: name [value-regex]
    --get-all             get all values: key [value-regex]
    --get-regexp          get values for regexp: name-regex [value-regex]
    --get-urlmatch        get value specific for the URL: section[.var] URL
    --replace-all         replace all matching variables: name value [value_regex]
    --add                 add a new variable: name value
    --unset               remove a variable: name [value-regex]
    --unset-all           remove all matches: name [value-regex]
    --rename-section      rename section: old-name new-name
    --remove-section      remove a section: name
    -l, --list            list all
    -e, --edit            open an editor
    --get-color           find the color configured: slot [default]
    --get-colorbool       find the color setting: slot [stdout-is-tty]

git --global --edit // 打开编辑器修改global配置文件
git --global --list // 列出该配置文件中的所有配置信息

git config --add user.age 25
git config user.xxx "hehehe"
git config --global user.name "zhangfengqi"

$ git config --global alias.co checkout
$ git config --global alias.last 'log -1 HEAD'

$ git config --global alias.unstage 'reset HEAD --'
// 下面两者等同
$ git unstage fileA
$ git reset HEAD -- fileA

$ git config --global alias.visual '!gitk'

vim .gitignore
*.swp
*.a
!lib.a // 忽略所有.a后缀，但是lib.a除外！

# no .a files
*.a
# but do track lib.a, even though you're ignoring .a files above
!lib.a
# only ignore the TODO file in the current directory, not subdir/TODO
/TODO
# ignore all files in the build/ directory
build/
# ignore doc/notes.txt, but not doc/server/arch.txt
doc/*.txt
# ignore all .pdf files in the doc/ directory
doc/**/*.pdf

git rm --cached deleteme.rb // 保存working tree的文件，只从stage中移除，并不再追踪

$ mv README.md README
$ git rm README.md
$ git add README

// Make a new folder named src, and move all of the .html files into this folder
git mv *.html src/

// git push origin HEAD
A handy way to push the current branch to the same name on the remote.

$ git status -s
 M README
MM Rakefile
A  lib/git.rb
M  lib/simplegit.rb
?? LICENSE.txt

commit a11bef06a3f659402fe7563abf99ad00de2209e6
Author: Scott Chacon <schacon@gee-mail.com>
Date:   Sat Mar 15 10:31:28 2008 -0700

    first commit

$ git log --pretty=oneline // 只有commit号和comment
4df268a7256494563ff21feeb245a5fb52e42709 m_school bug fixed1
a1f8f9f33ffa4a39d99a0325e92acd73a48e11fa agent phone

$ git log --pretty=short // 没有提交时间，是merge的提交会有简明提示
commit 7e65491f3f742c3dd3befccd01f74d60d1000c19
Author: zuoerdong

    redian index, brief content trim space and substr to length 100

commit de7042ce4004d8207d3aa4f768d076402ccc972c
Merge: 4f0513c 448fdf7
Author: Wang Chunwei

git log --pretty=full // 作者和提交者都会列出来，还是没有提交时间
commit 4df268a7256494563ff21feeb245a5fb52e42709
Author: Zhang Fengqi <zhangfengqi@xxx.com>
Commit: Zhang Fengqi <zhangfengqi@xxx.com>

    m_school bug fixed1

$ git log --pretty=fuller // 多了时间
commit 4df268a7256494563ff21feeb245a5fb52e42709
Author:     Zhang Fengqi <zhangfengqi@xxx.com>
AuthorDate: Fri Jan 15 18:28:23 2016 +0800
Commit:     Zhang Fengqi <zhangfengqi@xxx.com>
CommitDate: Fri Jan 15 18:28:23 2016 +0800

    m_school bug fixed1

$ git log --oneline --decorate
4df268a (HEAD, origin/master, origin/HEAD, master) m_school bug fixed1
a1f8f9f agent phone

$ git tag -a v1.4 -m 'my version 1.4'
$ git tag
v0.1
v1.3
v1.4

// 查看标签的详细信息
$ git show v1.4
tag v1.4
Tagger: Ben Straub <ben@straub.cc>
Date:   Sat May 3 20:19:12 2014 -0700

my version 1.4

commit ca82a6dff817ec66f44342007202690a93763949
Author: Scott Chacon <schacon@gee-mail.com>
Date:   Mon Mar 17 21:52:11 2008 -0700

    changed the version number

// 不需要任何其他参数，也不需要写comment
$ git tag v1.4-lw
$ git tag
v0.1
v1.3
v1.4
v1.4-lw
v1.5

// 假设v1.4的commit号为ca82a6，下面两者等同，不会有额外的标签信息
$ git show v1.4
$ git show ca82a6

$ git tag -a v1.2 9fceb02

$ git push origin v1.5
$ git push origin --tags // 推送所有不在远程仓库上的标签

$ git branch dev
  HEAD -> master
             ↓
98ca9 <--- f30ab
             ↑
            dev

$ git checkout -b dev // 当新建并切换到dev分支时，HEAD才会移动
           master
             ↓
98ca9 <--- f30ab
             ↑
            dev <- HEAD

                 var gitalk = new Gitalk({                     clientID: '82f3fb6574634b43d203',                     clientSecret: '5790d9fdbfe9340d29810b694b3b2070a9a3b492',                     repo: 'zfengqi.github.io',                     owner: 'zfengqi',                     admin: ['zfengqi'],                     distractionFreeMode: true,                     id: window.location.pathname,                     });                     gitalk.render('gitalk-container');