Transcription

1

2

3

4

5

6

7 color.*

8

9

10

11

12

13

14

15 p4 edit file 24b9da aa493b52f8696cd6d3b00373

16 git clone.git git clone --bare

17 $ yum install curl-devel expat-devel gettext-devel \ openssl-devel zlib-devel $ apt-get install libcurl4-gnutls-dev libexpat1-dev gettext \ libz-dev libssl-dev $ tar -zxf git tar.gz $ cd git $ make prefix=/usr/local all $ sudo make prefix=/usr/local install git git $ git clone git://git.kernel.org/pub/scm/git/git.git

18 $ yum install git-core $ apt-get install git $ sudo port install git-core +svn +doc +bash_completion +gitweb github.com/mxcl/homebrewbrew install git

19 git git-config git /etc/gitconfig git config --system ~/.gitconfig git config --global.git/config.git/config /etc/gitconfig.gitconfig $HOME C:\Documents and Settings\$USER /etc/gitconfig $ git config --global user.name "John Doe" $ git config --global user. johndoe@example.com

20 --global --global.git/ config $ git config --global core.editor emacs $ git config --global merge.tool vimdiff git config --list $ git config --list user.name=scott Chacon user. =schacon@gmail.com color.status=auto color.branch=auto color.interactive=auto color.diff=auto... /etc/gitconfig ~/.gitconfig

21 $ git config user.name Scott Chacon $ git help <verb> $ git <verb> --help $ man git-<verb> $ git help config #git #github

22

23 $ git init.git git add $ git add *.c $ git add README $ git commit -m 'initial project version'

24 git clone clone checkout git clone [url] $ git clone git://github.com/schacon/grit.git grit.git grit $ git clone git://github.com/schacon/grit.git mygrit mygrit git:// http(s):// user@server:/path.git

25 git status $ git status On branch master nothing to commit, working directory clean master git status $ vim README $ git status On branch master Untracked files: (use "git add <file>..." to include in what will be committed) README nothing added to commit but untracked files present (use "git add" to track) README

26 git add $ git add README git status $ git status On branch master Changes to be committed: (use "git reset HEAD <file>..." to unstage) new file: README git init git add git add git add benchmarks.rb status $ git status On branch master Changes to be committed: (use "git reset HEAD <file>..." to unstage) new file: README Changes not staged for commit: (use "git add <file>..." to update what will be committed) (use "git checkout -- <file>..." to discard changes in working directory) modified: benchmarks.rb benchmarks.rb git add

27 git add git status $ git add benchmarks.rb $ git status On branch master Changes to be committed: (use "git reset HEAD <file>..." to unstage) new file: modified: README benchmarks.rb benchmarks.rb git status $ vim benchmarks.rb $ git status On branch master Changes to be committed: (use "git reset HEAD <file>..." to unstage) new file: modified: README benchmarks.rb Changes not staged for commit: (use "git add <file>..." to update what will be committed) (use "git checkout -- <file>..." to discard changes in working directory) modified: benchmarks.rb benchmarks.rb git add git add git add $ git add benchmarks.rb $ git status On branch master Changes to be committed:

28 (use "git reset HEAD <file>..." to unstage) new file: modified: README benchmarks.rb.gitignore $ cat.gitignore *.[oa] *~.o.a ~ log tmp pid.gitignore.gitignore # /! * [abc]? [0-9].gitignore # 此为注释 将被 Git 忽略 # 忽略所有.a 结尾的文件 *.a # 但 lib.a 除外!lib.a # 仅仅忽略项目根目录下的 TODO 文件, 不包括 subdir/todo /TODO # 忽略 build/ 目录下的所有文件

29 build/ # 会忽略 doc/notes.txt 但不包括 doc/server/arch.txt doc/*.txt # ignore all.txt files in the doc/ directory doc/**/*.txt **/ git status git diff git diff git diff README benchmarks.rb status $ git status On branch master Changes to be committed: (use "git reset HEAD <file>..." to unstage) new file: README Changes not staged for commit: (use "git add <file>..." to update what will be committed) (use "git checkout -- <file>..." to discard changes in working directory) modified: benchmarks.rb git diff $ git diff diff --git a/benchmarks.rb b/benchmarks.rb index 3cb747f..da a/benchmarks.rb ,6 def end + run_code(x, 'commits 1') do

30 + git.commits.size + end + run_code(x, 'commits 2') do log = git.commits('master', 15) log.size git diff -- cached git diff --staged $ git diff --cached diff --git a/readme b/readme new file mode index a1 --- /dev/null ,0 +grit + by Tom Preston-Werner, Chris Wanstrath Grit is a Ruby library for extracting information from a Git repository git diff git diff git status $ git add benchmarks.rb $ echo '# test line' >> benchmarks.rb $ git status On branch master Changes to be committed: (use "git reset HEAD <file>..." to unstage) modified: benchmarks.rb

31 Changes not staged for commit: (use "git add <file>..." to update what will be committed) (use "git checkout -- <file>..." to discard changes in working directory) modified: benchmarks.rb git diff $ git diff diff --git a/benchmarks.rb b/benchmarks.rb index e445e28..86b2f7c a/benchmarks.rb ,3 end main() ##pp Grit::GitRuby.cache_client.stats +# test line git diff --cached $ git diff --cached diff --git a/benchmarks.rb b/benchmarks.rb index 3cb747f..e445e a/benchmarks.rb ,6 def end + run_code(x, 'commits 1') do + git.commits.size + end + run_code(x, 'commits 2') do log = git.commits('master', 15) log.size git add

32 git status git commit $ git commit $EDITOR git config --global core.editor # Please enter the commit message for your changes. Lines starting # with '#' will be ignored, and an empty message aborts the commit. # On branch master # Changes to be committed: # new file: README # modified: benchmarks.rb # ~ ~ ~ ".git/commit_editmsg" 10L, 283C git status -v $ git commit -m "Story 182: Fix benchmarks for speed" [master 463dc4f] Fix benchmarks for speed 2 files changed, 3 insertions(+) create mode README 463dc4f

33 git commit -a git add $ git status On branch master Changes not staged for commit: (use "git add <file>..." to update what will be committed) (use "git checkout -- <file>..." to discard changes in working directory) modified: benchmarks.rb no changes added to commit (use "git add" and/or "git commit -a") $ git commit -a -m 'added new benchmarks' [master 83e38c7] added new benchmarks 1 files changed, 5 insertions(+) git add git rm git status $ rm grit.gemspec $ git status On branch master Changes not staged for commit: (use "git add/rm <file>..." to update what will be committed) (use "git checkout -- <file>..." to discard changes in working directory) deleted: grit.gemspec no changes added to commit (use "git add" and/or "git commit -a") git rm

34 $ git rm grit.gemspec rm 'grit.gemspec' $ git status On branch master Changes to be committed: (use "git reset HEAD <file>..." to unstage) deleted: grit.gemspec -f.a.gitignore --cached $ git rm --cached readme.txt $ git rm log/\*.log * \ log/.log $ git rm \*~ ~ mv

35 $ git mv file_from file_to $ git mv README.txt README $ git status On branch master Changes to be committed: (use "git reset HEAD <file>..." to unstage) renamed: README.txt -> README git mv $ mv README.txt README $ git rm README.txt $ git add README git mv git log git clone git://github.com/schacon/simplegit-progit.git git log $ git log commit ca82a6dff817ec66f a Author: Scott Chacon <schacon@ge .com>

36 Date: Mon Mar 17 21:52: changed the version number commit 085bb3bcb608e1e8451d4b2432f8ecbe6306e7e7 Author: Scott Chacon Date: Sat Mar 15 16:40: removed unnecessary test code commit a11bef06a3f659402fe7563abf99ad00de2209e6 Author: Scott Chacon Date: Sat Mar 15 10:31: first commit git log git log -p -2 $ git log -p -2 commit ca82a6dff817ec66f a Author: Scott Chacon <schacon@ge .com> Date: Mon Mar 17 21:52: changed the version number diff --git a/rakefile b/rakefile index a874b73..8f a/rakefile ,5 require 'rake/gempackagetask' spec = Gem::Specification.new do s s.name = "simplegit" - s.version = "0.1.0" + s.version = "0.1.1" s.author = "Scott Chacon" s. = "schacon@ge .com commit 085bb3bcb608e1e8451d4b2432f8ecbe6306e7e7 Author: Scott Chacon <schacon@ge .com>

37 Date: Sat Mar 15 16:40: removed unnecessary test code diff --git a/lib/simplegit.rb b/lib/simplegit.rb index a0a60ae..47c a/lib/simplegit.rb +++ b/lib/simplegit.rb -18,8 +18,3 class SimpleGit end end - -if $0 == FILE - git = SimpleGit.new - puts git.show -end \ No newline at end of file --word-diff git log -p $ git log -U1 --word-diff commit ca82a6dff817ec66f a Author: Scott Chacon <schacon@ge .com> Date: Mon Mar 17 21:52: changed the version number diff --git a/rakefile b/rakefile index a874b73..8f a/rakefile ,3 spec = Gem::Specification.new do s s.name = "simplegit" s.version = [-"0.1.0"-]{+"0.1.1"+} s.author = "Scott Chacon"

38 {+ +} [- -] -U1 --stat $ git log --stat commit ca82a6dff817ec66f a Author: Scott Chacon <schacon@ge .com> Date: Mon Mar 17 21:52: changed the version number Rakefile file changed, 1 insertion(+), 1 deletion(-) commit 085bb3bcb608e1e8451d4b2432f8ecbe6306e7e7 Author: Scott Chacon <schacon@ge .com> Date: Sat Mar 15 16:40: removed unnecessary test code lib/simplegit.rb file changed, 5 deletions(-) commit a11bef06a3f659402fe7563abf99ad00de2209e6 Author: Scott Chacon <schacon@ge .com> Date: Sat Mar 15 10:31: first commit README Rakefile lib/simplegit.rb files changed, 54 insertions(+) --pretty oneline short full fuller

39 $ git log --pretty=oneline ca82a6dff817ec66f a changed the version number 085bb3bcb608e1e8451d4b2432f8ecbe6306e7e7 removed unnecessary test code a11bef06a3f659402fe7563abf99ad00de2209e6 first commit format $ git log --pretty=format:"%h - %an, %ar : %s" ca82a6d - Scott Chacon, 11 months ago : changed the version number 085bb3b - Scott Chacon, 11 months ago : removed unnecessary test code a11bef0 - Scott Chacon, 11 months ago : first commit %H %h %T %t %P %p %an %ae %ad %ar %cn %ce %cd %cr %s --graph

40 $ git log --pretty=format:"%h %s" --graph * 2d3acf9 ignore errors from SIGCHLD on trap * 5e3ee11 Merge branch 'master' of git://github.com/dustin/grit \ * 420eac9 Added a method for getting the current branch. * 30e367c timeout code and tests * 5a09431 add timeout protection to grit * e1193f8 support for heads with slashes in them / * d6016bc require time for xmlschema * 11d191e Merge branch 'defunkt' into local git log -p --word-diff --stat --shortstat --name-only --name-status --abbrev-commit --relative-date --graph --pretty --oneline --pretty=oneline --abbrev-co git log -2 -<n> n --since --until

41 $ git log --since=2.weeks --author --grep --all-match git log git log -- -(n) --since, --after --until, --before --author --committer $ git log --pretty="%h - %s" --author=gitster --since=" " \ --before=" " --no-merges -- t/ 5610e3b - Fix testcase failure when extended attribute acd3b9e - Enhance hold_lock_file_for_{update,append}() f demonstrate breakage of detached checkout wi d1a43f2 - reset --hard/read-tree --reset -u: remove un 51a94af - Fix "checkout --track -b newbranch" on detac b0ad11e - pull: allow "git pull origin $something:$cur git log git log

42 --amend $ git commit --amend --amend $ git commit -m 'initial commit' $ git add forgotten_file $ git commit --amend

43 git add. git status $ git add. $ git status On branch master Changes to be committed: (use "git reset HEAD <file>..." to unstage) modified: modified: README.txt benchmarks.rb git HEAD <file>... reset $ git reset HEAD benchmarks.rb Unstaged changes after reset: M benchmarks.rb $ git status On branch master Changes to be committed: (use "git reset HEAD <file>..." to unstage) modified: README.txt Changes not staged for commit: (use "git add <file>..." to update what will be committed) (use "git checkout -- <file>..." to discard changes in working directory) modified: benchmarks.rb

44 git status Changes not staged for commit: (use "git add <file>..." to update what will be committed) (use "git checkout -- <file>..." to discard changes in working directory) modified: benchmarks.rb $ git checkout -- benchmarks.rb $ git status On branch master Changes to be committed: (use "git reset HEAD <file>..." to unstage) modified: README.txt --amend

45 git remote $ git clone git://github.com/schacon/ticgit.git Cloning into 'ticgit'... remote: Reusing existing pack: 1857, done. remote: Total 1857 (delta 0), reused 0 (delta 0) Receiving objects: 100% (1857/1857), KiB KiB/s, done. Resolving deltas: 100% (772/772), done. Checking connectivity... done. $ cd ticgit $ git remote origin -v --verbose $ git remote -v origin git://github.com/schacon/ticgit.git (fetch) origin git://github.com/schacon/ticgit.git (push) $ cd grit $ git remote -v bakkdoor git://github.com/bakkdoor/grit.git cho45 git://github.com/cho45/grit.git defunkt git://github.com/defunkt/grit.git koke git://github.com/koke/grit.git origin git@github.com:mojombo/grit.git git remote add [shortname] [url]

46 $ git remote origin $ git remote add pb git://github.com/paulboone/ticgit.git $ git remote -v origin git://github.com/schacon/ticgit.git pb git://github.com/paulboone/ticgit.git pb git fetch pb $ git fetch pb remote: Counting objects: 58, done. remote: Compressing objects: 100% (41/41), done. remote: Total 44 (delta 24), reused 1 (delta 0) Unpacking objects: 100% (44/44), done. From git://github.com/paulboone/ticgit * [new branch] master -> pb/master * [new branch] ticgit -> pb/ticgit pb/ master $ git fetch [remote-name] git fetch origin git pull git clone git pull

47 git push [remote-name] [branch-name] origin $ git push origin master git remote show [remote-name] origin $ git remote show origin * remote origin URL: git://github.com/schacon/ticgit.git Remote branch merged with 'git pull' while on branch master master Tracked remote branches master ticgit git pull git remote show $ git remote show origin * remote origin URL: git@github.com:defunkt/github.git Remote branch merged with 'git pull' while on branch issues issues Remote branch merged with 'git pull' while on branch master master New remote branches (next fetch will store in remotes/origin)

48 caching Stale tracking branches (use 'git remote prune') libwalker walker2 Tracked remote branches acl apiv2 dashboard2 issues master postgres Local branch pushed with 'git push' master:master git push caching Stale tracking branches git pull issues master git remote rename pb paul $ git remote rename pb paul $ git remote origin paul pb/master paul/master git remote rm $ git remote rm paul $ git remote origin

49 git tag $ git tag v0.1 v1.3 $ git tag -l 'v1.4.2.*' v v v v a annotated $ git tag -a v1.4 -m 'my version 1.4' $ git tag v0.1

50 v1.3 v1.4 -m git show $ git show v1.4 tag v1.4 Tagger: Scott Chacon <schacon@ge .com> Date: Mon Feb 9 14:45: my version 1.4 commit b64cf874c3557a0f3547bd83b3ff6 Merge: 4a447f7... a6b4c97... Author: Scott Chacon <schacon@ge .com> Date: Sun Feb 8 19:02: Merge branch 'experiment' -a -s signed $ git tag -s v1.5 -m 'my signed 1.5 tag' You need a passphrase to unlock the secret key for user: "Scott Chacon <schacon@ge .com>" 1024-bit DSA key, ID F721C45A, created git show $ git show v1.5 tag v1.5 Tagger: Scott Chacon <schacon@ge .com> Date: Mon Feb 9 15:22:

51 my signed 1.5 tag -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.8 (Darwin) ieyeabecaayfakmquriacgkqon3dxfchxfr5caceimn+zxlkggjqf0qyiqbwgysn Ki0An2JeAVUCAiJ7Ox6ZEtK+NvZAj82/ =WryJ -----END PGP SIGNATURE----- commit b64cf874c3557a0f3547bd83b3ff6 Merge: 4a447f7... a6b4c97... Author: Scott Chacon Date: Sun Feb 8 19:02: Merge branch 'experiment' -a -s -m $ git tag v1.4-lw $ git tag v0.1 v1.3 v1.4 v1.4-lw v1.5 git show $ git show v1.4-lw commit b64cf874c3557a0f3547bd83b3ff6 Merge: 4a447f7... a6b4c97... Author: Scott Chacon <schacon@ge .com> Date: Sun Feb 8 19:02: Merge branch 'experiment'

52 git tag -v [tag-name] verify $ git tag -v v object babd8ee7ea23e6a5c392bb739348b1eb61 type commit tag v tagger Junio C Hamano <junkio@cox.net> GIT Minor fixes since 1.4.2, including git-mv and git-http with alternates. gpg: Signature made Wed Sep 13 02:08: PDT using DSA key ID F3119B9A gpg: Good signature from "Junio C Hamano <junkio@cox.net>" gpg: aka "[jpeg image of size 1513]" Primary key fingerprint: A E066 C9A7 4A7D C0C6 D9A4 F311 9B9A gpg: Signature made Wed Sep 13 02:08: PDT using DSA key ID F3119B9A gpg: Can't check signature: public key not found error: could not verify the tag 'v ' $ git log --pretty=oneline b64cf874c3557a0f3547bd83b3ff6 Merge branch 'experiment' a6b4c97498bd301d84096da251c98a07c7723e65 beginning write support 0d52aaab da7686c15f77a3d64d one more thing 6d52a271eda dd79daabbc4d9b6008e Merge branch 'experiment' 0b7434d86859cc7b8c3d5e1dddfed66ff742fcbc added a commit function 4682c bdd616e23b64b0857d832627b added a todo file 166ae0c4d3f420721acbb115cc33848dfcc2121a started write support 9fceb02d0ae598e95dc970b74767f19372d61af8 updated rakefile 964f16d36dfccde844893cac5b347e7b3d44abbc commit the todo 8a5cbc430f1a9c3d00faaeffd a updated readme

53 $ git tag -a v1.2 9fceb02 $ git tag v0.1 v1.2 v1.3 v1.4 v1.4-lw v1.5 $ git show v1.2 tag v1.2 Tagger: Scott Chacon <schacon@ge .com> Date: Mon Feb 9 15:32: version 1.2 commit 9fceb02d0ae598e95dc970b74767f19372d61af8 Author: Magnus Chacon <mchacon@ge .com> Date: Sun Apr 27 20:43: updated rakefile git push git push origin [tagname] $ git push origin v1.5 Counting objects: 50, done. Compressing objects: 100% (38/38), done. Writing objects: 100% (44/44), 4.56 KiB, done. Total 44 (delta 18), reused 8 (delta 1) To git@github.com:schacon/simplegit.git * [new tag] v1.5 -> v1.5

54 --tags $ git push origin --tags Counting objects: 50, done. Compressing objects: 100% (38/38), done. Writing objects: 100% (44/44), 4.56 KiB, done. Total 44 (delta 18), reused 8 (delta 1) To git@github.com:schacon/simplegit.git * [new tag] v0.1 -> v0.1 * [new tag] v1.2 -> v1.2 * [new tag] v1.4 -> v1.4 * [new tag] v1.4-lw -> v1.4-lw * [new tag] v1.5 -> v1.5 contrib/completion git-completion.bash cp gitcompletion.bash ~/.git-completion.bash.bashrc source ~/.git-completion.bash /opt/local/ etc/bash_completion.d /etc/bash_completion.d/

55 $ git co<tab><tab> commit config m<tab> git commit git log $ git log --s<tab> --shortstat --since= --src-prefix= --stat --summary git config $ git config --global alias.co checkout $ git config --global alias.br branch $ git config --global alias.ci commit $ git config --global alias.st status git commit git ci $ git config --global alias.unstage 'reset HEAD --' $ git unstage filea $ git reset HEAD filea last

56 $ git config --global alias.last 'log -1 HEAD' $ git last commit 66938dae3329c7aebe598c2246a8e6af90d04646 Author: Josh Goebel <dreamer3@example.com> Date: Tue Aug 26 19:48: test for current head Signed-off-by: Scott Chacon <schacon@example.com>! git visual gitk $ git config --global alias.visual '!gitk'

57 $ git add README test.rb LICENSE $ git commit -m 'initial commit of my project' git commit

58 git branch

59 $ git branch testing git branch git checkout $ git checkout testing $ vim test.rb $ git commit -a -m 'made a change'

60 git checkout $ git checkout master

61 $ vim test.rb $ git commit -a -m 'made other changes' branch checkout parent

62 git checkout -b $ git checkout -b iss53 Switched to a new branch 'iss53' $ git branch iss53 $ git checkout iss53 iss53 HEAD iss53 $ vim index.html $ git commit -a -m 'added a new footer [issue 53]'

63 iss53 master master $ git checkout master Switched to branch 'master' hotfix $ git checkout -b hotfix Switched to a new branch 'hotfix' $ vim index.html $ git commit -a -m 'fixed the broken address' [hotfix 3a0874c] fixed the broken address 1 files changed, 1 deletion(-) master git merge

64 $ git checkout master $ git merge hotfix Updating f42c576..3a0874c Fast-forward README 1-1 file changed, 1 deletion(-) master hotfix master master hotfix master hotfix git branch -d $ git branch -d hotfix

65 Deleted branch hotfix (was 3a0874c). $ git checkout iss53 Switched to branch 'iss53' $ vim index.html $ git commit -a -m 'finished the new footer [issue 53]' [iss53 ad82d7a] finished the new footer [issue 53] 1 file changed, 1 insertion(+) hotfix iss53 git merge master iss53 iss53 iss53 master master hotfix master git merge $ git checkout master $ git merge iss53 Auto-merging README Merge made by the 'recursive' strategy. README file changed, 1 insertion(+) hotfix master iss53

66 master iss53 $ git branch -d iss53

67 hotfix $ git merge iss53 Auto-merging index.html CONFLICT (content): Merge conflict in index.html Automatic merge failed; fix conflicts and then commit the result. git status $ git status On branch master You have unmerged paths. (fix conflicts and run "git commit") Unmerged paths: (use "git add <file>..." to mark resolution) both modified: index.html no changes added to commit (use "git add" and/or "git commit -a") <<<<<<< HEAD <div id="footer">contact : .support@github.com</div> ======= <div id="footer"> please contact us at support@github.com </div> >>>>>>> iss53 ======= HEAD master merge iss53 <div id="footer"> please contact us at .support@github.com </div>

68 <<<<<<< ======= >>>>>>> git add git mergetool $ git mergetool This message is displayed because 'merge.tool' is not configured. See 'git mergetool --tool-help' or 'git help config' for more details. 'git mergetool' will now attempt to use one of the following tools: opendiff kdiff3 tkdiff xxdiff meld tortoisemerge gvimdiff diffuse diffmerge ecmerge p4merge araxis bc3 Merging: index.html Normal merge conflict for 'index.html': {local}: modified file {remote}: modified file Hit return to start merge resolution tool (opendiff): opendiff git status $ git status On branch master Changes to be committed: (use "git reset HEAD <file>..." to unstage) modified: index.html git commit Merge branch 'iss53' Conflicts: index.html

69 # # It looks like you may be committing a merge. # If this is not correct, please remove the file #.git/merge_head # and try again. # git branch $ git branch iss53 * master testing master * master git branch -v $ git branch -v iss53 93b412c fix javascript issue * master 7a98805 Merge branch 'iss53' testing 782fd34 add scott to the author list in the readmes --merged -- no-merged git branch --merged $ git branch --merged iss53 * master

70 iss53 * git branch -d git branch --no-merged $ git branch --no-merged testing git branch -d $ git branch -d testing error: The branch 'testing' is not fully merged. If you are sure you want to delete it, run 'git branch -D testing'. -D master develop next master iss53 proposed pu next master

71 iss53 hotfix master iss91 iss91v2 master iss91v2 master dumbidea iss91v2 dumbidea iss91

72 ( 远程仓库名 )/( 分支名 ) origin master origin/master iss53 iss53 origin/iss53 git.ourcompany.com origin

73 master origin/master master origin master origin master master git.ourcompany.com master origin/master git fetch origin origin git.ourcompany.com origin/master git.team1.ourcompany.com

74 git remote add teamone git fetch teamone origin teamone/master teamone master 31b8e

75 serverfix git push ( 远程仓库名 ) ( 分支名 ) $ git push origin serverfix Counting objects: 20, done. Compressing objects: 100% (14/14), done. Writing objects: 100% (15/15), 1.74 KiB, done. Total 15 (delta 5), reused 0 (delta 0) To git@github.com:schacon/simplegit.git * [new branch] serverfix -> serverfix serverfix refs/heads/serverfix:refs/ heads/serverfix refs/heads/ git push origin serverfix:serverfix awesomebranch git push origin serverfix:awesomebranch origin/serverfix serverfix

76 $ git fetch origin remote: Counting objects: 20, done. remote: Compressing objects: 100% (14/14), done. remote: Total 15 (delta 5), reused 0 (delta 0) Unpacking objects: 100% (15/15), done. From git@github.com:schacon/simplegit * [new branch] serverfix -> origin/serverfix fetch serverfix origin/serverfix git merge origin/serverfix serverfix $ git checkout -b serverfix origin/serverfix Branch serverfix set up to track remote branch serverfix from origin. Switched to a new branch 'serverfix' serverfix origin/serverfix checkout git push git pull master origin/master git push git pull origin master git checkout -b [ 分支名 ] [ 远程名 ]/[ 分支名 ] --track $ git checkout --track origin/serverfix Branch serverfix set up to track remote branch serverfix from origin. Switched to a new branch 'serverfix'

77 $ git checkout -b sf origin/serverfix Branch sf set up to track remote branch serverfix from origin. Switched to a new branch 'sf' sf origin/serverfix master git push [ 远程名 ] :[ 分支名 ] serverfix $ git push origin :serverfix To git@github.com:schacon/simplegit.git - [deleted] serverfix git push [ 远程名 ] [ 本地分支 ]:[ 远程分支 ] [ 本地分支 ] [ 远程分支 ] merge rebase rebase

78 merge rebase $ git checkout experiment $ git rebase master First, rewinding head to replay your work on top of it... Applying: added staged command experiment master experiment master master

79 origin/master server client server server master server master git rebase --onto master

80 $ git rebase --onto master server client client client server master client server client master $ git checkout master $ git merge client server server master server git rebase [ 主分支 ] [ 特性分支 ] server master

81 $ git rebase master server server master master $ git checkout master $ git merge server client server $ git branch -d client $ git branch -d server git rebase

82 git push --force git log

83

84

85 .git

86 $ git clone /opt/git/project.git $ git clone file:///opt/git/project.git file:// file:// file:// $ git remote add local_proj /opt/git/project.git git pull /home/john/project

87 $ git clone $ git clone git-daemon-export-ok

88 git:// xinetd post-update $ cd /var/www/htdocs/ $ git clone --bare /path/to/git_project gitproject.git $ cd gitproject.git $ mv hooks/post-update.sample hooks/post-update $ chmod a+x hooks/post-update post-update git updateserver-info $ git clone /var/www/htdocs docs/howto/setup-git-server-over-http.txt

89 --bare.git $ git clone --bare my_project my_project.git Cloning into bare repository 'my_project.git'... done. clone git init git fetch git init my_project.git $ cp -Rf my_project/.git my_project.git git.example.com /opt/git

90 $ scp -r my_project.git /opt/git $ git clone user@git.example.com:/opt/git/my_project.git /opt/git/my_project.git git init --shared --shared g+sx rws $ ssh user@git.example.com $ cd /opt/git/my_project.git $ git init --bare --shared

91 adduser git git ~/.ssh/authorized_keys git ~/.ssh $ cd ~/.ssh $ ls authorized_keys2 id_dsa known_hosts config id_dsa.pub something something.pub something id_dsa id_rsa.pub.ssh ssh-keygen $ ssh-keygen Generating public/private rsa key pair. Enter file in which to save the key (/Users/schacon/.ssh/id_rsa): Enter passphrase (empty for no passphrase): Enter same passphrase again: Your identification has been saved in /Users/schacon/.ssh/id_rsa. Your public key has been saved in /Users/schacon/.ssh/id_rsa.pub. The key fingerprint is: 43:c5:5b:5f:b1:f1:50:43:ad:20:a6:92:6a:1f:9a:3a schacon@agadorlaptop.local.ssh/id_rsa.pub

92 $ cat ~/.ssh/id_rsa.pub ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAklOUpkDHrfHY17SbrmTIpNLTGK9Tjom/BWDSU GPl+nafzlHDTYW7hdI4yZ5ew18JH4JW9jbhUFrviQzM7xlELEVf4h9lFX5QVkbPppSwg0cda3 Pbv7kOdJ/MTyBlWXFCR+HAo3FXRitBqxiX1nKhXpHAZsMciLq8V6RjsNAQwdsdMFvSlVK/7XA t3faojoasncm1q9x5+3v0ww68/eifmb1zuufljqjkprrx88xypndvjynby6vw/pb0rwert/en mz+aw4ozpntpi89zpmvmluayrd2ce86z/il8b+gw3r3+1nkatmikjn2so1d01qratlmqvssbx NrRFi9wrf+M7Q== authorized_keys.ssh $ sudo adduser git $ su git $ cd $ mkdir.ssh authorized_keys $ cat /tmp/id_rsa.john.pub ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCB007n/ww+ouN4gSLKssMxXnBOvf9LGt4L ojg6rs6hpb09j9r/t17/x4lhja0f3fr1rp6kybrswj2athgw6hxlm9/5zytk6ztg3rpkk+4k Yjh6541NYsnEAZuXz0jTTyAUfrtU3Z5E003C4oxOj6H0rfIF1kKI9MAQLMdpGW1GYEIgS9Ez Sdfd8AcCIicTDWbqLAcU4UpkaX8KyGlLwsNuuGztobF8m72ALC/nLF6JLtPofwFBlgc+myiv O7TCUSBdLQlgMVOFq1I2uPWQOkOWQAHukEOmfjy2jctxSDBQ220ymjaNsHT4kgtZg2AYYgPq dav8jggjicuvax2t9va5 gsg-keypair authorized_keys $ cat /tmp/id_rsa.john.pub >> ~/.ssh/authorized_keys $ cat /tmp/id_rsa.josie.pub >> ~/.ssh/authorized_keys $ cat /tmp/id_rsa.jessica.pub >> ~/.ssh/authorized_keys

93 --bare git init $ cd /opt/git $ mkdir project.git $ cd project.git $ git --bare init gitserver git gitserver # 在 John 的电脑上 $ cd myproject $ git init $ git add. $ git commit -m 'initial commit' $ git remote add origin git@gitserver:/opt/git/project.git $ git push origin master $ git clone git@gitserver:/opt/git/project.git $ cd project $ vim README $ git commit -am 'fix for the README file' $ git push origin master git-shell git git /etc/passwd $ sudo vim /etc/passwd

94 git:x:1000:1000::/home/git:/bin/sh bin/sh /usr/bin/git-shell which git-shell git:x:1000:1000::/home/git:/usr/bin/git-shell git $ ssh git@gitserver fatal: What do you think I am? A shell? Connection to gitserver closed. post-update /opt/git $ cd project.git $ mv hooks/post-update.sample hooks/post-update $ chmod a+x hooks/post-update post-update $ cat.git/hooks/post-update #!/bin/sh # # An example hook script to prepare a packed repository for use over # dumb transports.

95 # # To enable this hook, rename this file to "post-update". # exec git-update-server-info git-update-server-info.gitserver <VirtualHost *:80> ServerName git.gitserver DocumentRoot /opt/git <Directory /opt/git/> Order allow, deny allow from all </Directory> </VirtualHost> /opt/git www-data $ chgrp -R www-data /opt/git $ git clone http: //git.kernel.org

96 lighttpd webrick lighttpd git instaweb webrick git instaweb --httpd $ git instaweb --httpd=webrick [ :02:21] INFO WEBrick [ :02:21] INFO ruby ( ) [universal-darwin9.0] --stop $ git instaweb --httpd=webrick --stop apt yum gitweb $ git clone git://git.kernel.org/pub/scm/git/git.git $ cd git/ $ make GITWEB_PROJECTROOT="/opt/git" \ prefix=/usr gitweb $ sudo cp -Rf gitweb /var/www/ GITWEB_PROJECTROOT

97 <VirtualHost *:80> ServerName gitserver DocumentRoot /var/www/gitweb <Directory /var/www/gitweb> Options ExecCGI +FollowSymLinks +SymLinksIfOwnerMatch AllowOverride All order allow,deny Allow from all AddHandler cgi-script cgi DirectoryIndex gitweb.cgi </Directory> </VirtualHost> authorized_keys authorized_keys $ apt-get install python-setuptools $ git clone $ cd gitosis $ sudo python setup.py install

98 /home/git /opt/git $ ln -s /opt/git /home/git/repositories authorized_keys $ mv /home/git/.ssh/authorized_keys /home/git/.ssh/ak.bak git git-shell authorized_keys /etc/ passwd git:x:1000:1000::/home/git:/usr/bin/git-shell git:x:1000:1000::/home/git:/bin/sh gitosis-init $ sudo -H -u git gitosis-init < /tmp/id_dsa.pub Initialized empty Git repository in /opt/git/gitosis-admin.git/ Reinitialized existing Git repository in /opt/git/gitosis-admin.git/ post-update $ sudo chmod 755 /opt/git/gitosis-admin.git/hooks/post-update

99 $ ssh PTY allocation request failed on channel 0 ERROR:gitosis.serve.main:Need SSH_ORIGINAL_COMMAND in environment. Connection to gitserver closed. # 在你本地计算机上 $ git clone git@gitserver:gitosis-admin.git gitosis-admin $ cd gitosis-admin $ find../gitosis.conf./keydir./keydir/scott.pub gitosis.conf keydir keydir scott.pub gitosis-init gitosis.conf gitosis-admin $ cat gitosis.conf [gitosis] [group gitosis-admin] members = scott writable = gitosis-admin scott gitosis-admin mobile iphone_project

100 [group mobile] members = scott writable = iphone_project gitosis-admin $ git commit -am 'add iphone_project and mobile group' [master 8962da8] add iphone_project and mobile group 1 file changed, 4 insertions(+) $ git push origin master Counting objects: 5, done. Compressing objects: 100% (3/3), done. Writing objects: 100% (3/3), 272 bytes 0 bytes/s, done. Total 3 (delta 0), reused 0 (delta 0) To git@gitserver:gitosis-admin.git fb27aec..8962da8 master -> master iphone_project $ git remote add origin git@gitserver:iphone_project.git $ git push origin master Initialized empty Git repository in /opt/git/iphone_project.git/ Counting objects: 3, done. Writing objects: 100% (3/3), 230 bytes 0 bytes/s, done. Total 3 (delta 0), reused 0 (delta 0) To git@gitserver:iphone_project.git * [new branch] master -> master ~/.ssh/authorized_keys keydir gitosis.conf $ cp /tmp/id_rsa.john.pub keydir/john.pub $ cp /tmp/id_rsa.josie.pub keydir/josie.pub $ cp /tmp/id_rsa.jessica.pub keydir/jessica.pub

101 iphone_project [group mobile] members = scott john josie jessica writable = iphone_project [group mobile] members = scott josie jessica writable = iphone_project [group mobile_ro] members = john readonly = [group mobile_committers] members = scott josie jessica [group mobile] members writable = iphone_project [group mobile_2] members john writable = another_iphone_project loglevel=debug [gitosis] /home/git/.gitosis.conf gitosis.conf gitosis-admin

102 sshd httpd git gitserver git ~/.ssh/id_rsa.pub ssh-keygen <yourname>.pub scott.pub $ git clone git://github.com/sitaramc/gitolite $ gitolite/install -ln # assumes $HOME/bin exists and is in your $PATH $ gitolite setup -pk $HOME/scott.pub gitolite-admin git clone git@gitserver:gitolite-admin gitolite-admin

103 gitolite-admin $ cd ~/gitolite-admin/ $ ls conf/ keydir/ $ find conf keydir -type f conf/gitolite.conf keydir/scott.pub $ cat conf/gitolite.conf repo gitolite-admin RW+ = scott repo testing RW+ gl-setup gitolite-admin alice.pub keydir = linux perl rakudo git gitolite = = scott = ashok = sitaram dilbert wally @interns

104 RW int$ RW eng- RW refs/tags/rc[0-9] RW+ RW RW+ refs/heads/ refs/ oss_repos repo gitolite RW+ = sitaram gitolite W + R RW RW+ - RW master integ - master integ RW+

105 repo foo - VREF/NAME/Makefile conf/example.conf refs/personal/<devname>/* doc/3-faq-tips-etc.mkd assignments/s[0-9][0-9]/a[0-9][0-9] $GL_WILDREPOS = 1; doc/4-wildcard-repositories.mkd RW+

106 hello scott, this is running gitolite3 v g on git R anu-wsd R entrans R W git-notes R W gitolite R W gitolite-admin R indic_web_input R shreelipi_converter doc/ git daemon --reuseaddr --base-path=/opt/git/ /opt/git/ --reuseaddr -- base-path /etc/event.d/local-git-daemon

107 start on startup stop on shutdown exec /usr/bin/git daemon \ --user=git --group=git \ --reuseaddr \ --base-path=/opt/git/ \ /opt/git/ respawn git-ro git-ro initctl start local-git-daemon xinetd sysvinit gitosis.conf [repo iphone_project] daemon = yes $ cd /path/to/project.git $ touch git-daemon-export-ok / etc/gitweb.conf

108 $projects_list = "/home/git/gitosis/projects.list"; $projectroot = "/home/git/repositories"; $export_ok = = ('git://gitserver'); gitweb repo [repo iphone_project] daemon = yes gitweb = yes grit github.com/grit github.com/ shacon/grit shacon

109

110 $ git init $ git add. $ git commit -m 'initial commit'

111 $ git remote add origin $ git push origin master

112

113 git log

114

115

116

117

118 Documentation/SubmittingPatches git diff --check X $ git diff --check lib/simplegit.rb:5: trailing whitespace. = File.expand_path(git_dir)XX lib/simplegit.rb:7: trailing whitespace. + XXXXXXXXXXX lib/simplegit.rb:26: trailing whitespace. + def command(git_cmd)xxxx git add --patch

119 本次更新的简要描述 (50 个字符以内 ) 如果必要, 此处展开详尽阐述 段落宽度限定在 72 个字符以内 某些情况下, 第一行的简要描述将用作邮件标题, 其余部分作为邮件正文 其间的空行是必要的, 以区分两者 ( 当然没有正文另当别论 ) 如果并在一起,rebase 这样的工具就可能会迷惑 另起空行后, 再进一步补充其他说明 - 可以使用这样的条目列举式 - 一般以单个空格紧跟短划线或者星号作为每项条目的起始符 每个条目间用一空行隔开 不过这里按自己项目的约定, 可以略作变化 git log --no-merges git clone git://git.kernel.org/pub/scm/git/git.git -m git commit... # John's Machine $ git clone john@githost:simplegit.git Initialized empty Git repository in /home/john/simplegit/.git/...

120 $ cd simplegit/ $ vim lib/simplegit.rb $ git commit -am 'removed invalid default value' [master 738ee87] removed invalid default value 1 files changed, 1 insertions(+), 1 deletions(-) # Jessica's Machine $ git clone jessica@githost:simplegit.git Initialized empty Git repository in /home/jessica/simplegit/.git/... $ cd simplegit/ $ vim TODO $ git commit -am 'add reset task' [master fbff5bc] add reset task 1 files changed, 1 insertions(+), 0 deletions(-) # Jessica's Machine $ git push origin master... To jessica@githost:simplegit.git 1edee6b..fbff5bc master -> master # John's Machine $ git push origin master To john@githost:simplegit.git! [rejected] master -> master (non-fast forward) error: failed to push some refs to 'john@githost:simplegit.git'

121 $ git fetch origin... From + 049d078...fbff5bc master -> origin/master origin/ master master $ git merge origin/master Merge made by recursive. TODO files changed, 1 insertions(+), 0 deletions(-) $ git push origin master... To john@githost:simplegit.git fbff5bc..72bbc59 master -> master

122 issue54 # Jessica's Machine $ git fetch origin... From jessica@githost:simplegit fbff5bc..72bbc59 master -> origin/master git log

123 $ git log --no-merges origin/master ^issue54 commit 738ee872852dfaa9d6634e0dea7a Author: John Smith Date: Fri May 29 16:01: removed invalid default value master origin/master master $ git checkout master Switched to branch "master" Your branch is behind 'origin/master' by 2 commits, and can be fast-forwarded. origin/master issue54 issue54 $ git merge issue54 Updating fbff5bc..4af4298 Fast forward README 1 + lib/simplegit.rb files changed, 6 insertions(+), 1 deletions(-) origin/master

124 $ git merge origin/master Auto-merging lib/simplegit.rb Merge made by recursive. lib/simplegit.rb files changed, 1 insertions(+), 1 deletions(-) master origin/master $ git push origin master... To jessica@githost:simplegit.git 72bbc c15 master -> master master origin/master

125 master featurea # Jessica's Machine $ git checkout -b featurea Switched to a new branch "featurea" $ vim lib/simplegit.rb $ git commit -am 'add limit to log function' [featurea ] add limit to log function 1 files changed, 1 insertions(+), 1 deletions(-) featurea master

126 $ git push origin featurea... To * [new branch] featurea -> featurea featurea featureb master # Jessica's Machine $ git fetch origin $ git checkout -b featureb origin/master Switched to a new branch "featureb" featureb $ vim lib/simplegit.rb $ git commit -am 'made the ls-tree function recursive' [featureb e5b0fdc] made the ls-tree function recursive 1 files changed, 1 insertions(+), 1 deletions(-) $ vim lib/simplegit.rb $ git commit -am 'add ls-files' [featureb ] add ls-files 1 files changed, 5 insertions(+), 0 deletions(-)

127 featurebee git fetch $ git fetch origin... From jessica@githost:simplegit * [new branch] featurebee -> origin/featurebee git merge $ git merge origin/featurebee Auto-merging lib/simplegit.rb Merge made by recursive. lib/simplegit.rb files changed, 4 insertions(+), 0 deletions(-) featureb featurebee $ git push origin featureb:featurebee... To jessica@githost:simplegit.git fba9af8..cd685d1 featureb -> featurebee featurea git fetch $ git fetch origin... From jessica@githost:simplegit aad881d featurea -> origin/featurea git log $ git log origin/featurea ^featurea commit aad881d154acdaeb2b6b18ea0e827ed8a6d671e6

128 Author: John Smith Date: Fri May 29 19:57: changed log output to 30 from 25 featurea $ git checkout featurea Switched to branch "featurea" $ git merge origin/featurea Updating aad881d Fast forward lib/simplegit.rb files changed, 9 insertions(+), 1 deletions(-) $ git commit -am 'small tweak' [featurea 774b3ed] small tweak 1 files changed, 1 insertions(+), 1 deletions(-) $ git push origin featurea... To jessica@githost:simplegit.git b3ed featurea -> featurea featurea featurebee

129

130 $ git clone (url) $ cd project $ git checkout -b featurea $ (work) $ git commit $ (work) $ git commit rebase -i git://githost/simplegit.git myfork $ git remote add myfork (url) $ git push myfork featurea git request-pull request-pull myfork $ git request-pull origin/master myfork The following changes since commit 1edee6b1d61823a2de3b09c160d7080b8d1b3a40: John Smith (1): added a new function

131 are available in the git repository at: git://githost/simplegit.git featurea Jessica Smith (2): add limit to log function change log output to 30 from 25 lib/simplegit.rb files changed, 9 insertions(+), 1 deletions(-) master origin/master master $ git checkout -b featureb origin/master $ (work) $ git commit $ git push myfork featureb $ ( maintainer) $ git fetch origin origin/master

132 $ git checkout featurea $ git rebase origin/master $ git push -f myfork featurea -f featurea featureav2 origin/master featurebv2 featureb $ git checkout -b featurebv2 origin/master $ git merge --no-commit --squash featureb $ (change implementation) $ git commit $ git push myfork featurebv2 --squash --nocommit featurebv2

133 $ git checkout -b topica $ (work) $ git commit $ (work) $ git commit git format-patch.patch $ git format-patch -M origin/master 0001-add-limit-to-log-function.patch 0002-changed-log-output-to-30-from-25.patch format-patch -M $ cat 0001-add-limit-to-log-function.patch From d704da8e76ca5c05c198e71a8 Mon Sep 17 00:00: From: Jessica Smith <jessica@example.com> Date: Sun, 6 Apr :17: Subject: [PATCH 1/2] add limit to log function Limit log functionality to the first lib/simplegit.rb files changed, 1 insertions(+), 1 deletions(-)

134 diff --git a/lib/simplegit.rb b/lib/simplegit.rb index 76f47bc..f9815f a/lib/simplegit.rb +++ b/lib/simplegit.rb -14,7 +14,7 class SimpleGit end def log(treeish = 'master') - command("git log #{treeish}") + command("git log -n 20 #{treeish}") end -- def ls_tree(treeish = 'master') rc1.20.g8c5b.dirty --- Limit log functionality to the first 20 Documentation/ SubmittingPatches ~/.gitconfig git config [imap] folder = "[Gmail]/Drafts" host = imaps://imap.gmail.com user = user@gmail.com pass = p4ssw0rd port = 993 sslverify = false imap:// s imaps:// git send- [Gmail]/Drafts

135 $ cat *.patch git imap-send Resolving imap.gmail.com... ok Connecting to [ ]: ok Logging in... sending 2 messages 100% (2/2) done git config ~/.gitconfig [send ] smtpencryption = tls smtpserver = smtp.gmail.com smtpuser = user@gmail.com smtpserverport = 587 git send- $ git send- *.patch 0001-added-limit-to-log-function.patch 0002-changed-log-output-to-30-from-25.patch Who should the s appear to be from? [Jessica Smith <jessica@example.com>] s will be sent from: Jessica Smith <jessica@example.com> Who should the s be sent to? jessica@example.com Message-ID to be used as In-Reply-To for the first ? y (mbox) Adding cc: Jessica Smith <jessica@example.com> from \line 'From: Jessica Smith <jessica@example.com>' OK. Log says: Sendmail: /usr/sbin/sendmail -i jessica@example.com From: Jessica Smith <jessica@example.com> To: jessica@example.com Subject: [PATCH 1/2] added limit to log function

136 Date: Sat, 30 May :29: Message-Id: X-Mailer: git-send rc1.20.g8c5b.dirty In-Reply-To: <y> References: <y> Result: OK format-patch ruby_client sc/ruby_client sc $ git branch sc/ruby_client master checkout -b $ git checkout -b sc/ruby_client master git apply git am

137 git diff diff git apply /tmp/patch-ruby-client.patch $ git apply /tmp/patch-ruby-client.patch patch -p1 git diff patch git apply patch git apply patch git apply --check $ git apply --check 0001-seeing-if-this-helps-the-gem.patch error: patch failed: ticgit.gemspec:1 error: ticgit.gemspec: patch does not apply format-patch format-patch diff git apply format-patch git am git am From d704da8e76ca5c05c198e71a8 Mon Sep 17 00:00: From: Jessica Smith <jessica@example.com> Date: Sun, 6 Apr :17: Subject: [PATCH 1/2] add limit to log function Limit log functionality to the first 20

138 format-patch git send- git am git am format-patch git am $ git am 0001-limit-log-function.patch Applying: add limit to log function From Date Subject $ git log --pretty=fuller -1 commit 6c5e70b984a60b3cecd395edd5b48a7575bf58e0 Author: Jessica Smith <jessica@example.com> AuthorDate: Sun Apr 6 10:17: Commit: Scott Chacon <schacon@gmail.com> CommitDate: Thu Apr 9 09:19: add limit to log function Limit log functionality to the first 20 Commit Author git am $ git am 0001-seeing-if-this-helps-the-gem.patch Applying: seeing if this helps the gem error: patch failed: ticgit.gemspec:1 error: ticgit.gemspec: patch does not apply Patch failed at When you have resolved this problem run "git am --resolved". If you would prefer to skip this patch, instead run "git am --skip". To restore the original branch and stop patching run "git am --abort". git am --resolved

139 $ (fix the file) $ git add ticgit.gemspec $ git am --resolved Applying: seeing if this helps the gem -3 $ git am seeing-if-this-helps-the-gem.patch Applying: seeing if this helps the gem error: patch failed: ticgit.gemspec:1 error: ticgit.gemspec: patch does not apply Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... No changes -- Patch already applied. -3 am - i $ git am -3 -i mbox Commit Body is: seeing if this helps the gem Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all ruby-client

140 $ git remote add jessica git://github.com/jessica/myproject.git $ git fetch jessica $ git checkout -b rubyclient jessica/ruby-client -3 git pull $ git pull git://github.com/onetimeguy/project.git From git://github.com/onetimeguy/project * branch HEAD -> FETCH_HEAD Merge made by recursive. contrib --not master $ git log contrib --not master commit 5b6235bd efc4d73316f0a68d484f118 Author: Scott Chacon <schacon@gmail.com> Date: Fri Oct 24 09:53: seeing if this helps the gem commit 7482e0d16d04bea79d0dba8988cc78df655f16a0 Author: Scott Chacon <schacon@gmail.com>

141 Date: Mon Oct 22 19:38: updated the gemspec to hopefully work better git log -p $ git diff master master diff master master master master $ git merge-base contrib master 36c7dba2c95e6bbb78dfa822519ecfec6e1ca649 $ git diff 36c7db... diff... $ git diff master...contrib master

142 ruby_client php_client ruby_client php_client master develop ruby_client develop C8 develop master C8 develop

143 master next pu maint

144 next pu master next mastermaster next pu master maint develop master

145 e43a6 $ git cherry-pick e43a6fd3e94888d76779ad79fb568ed180e5fcdf Finished one cherry-pick. [master]: created a0a41a9: "More friendly message when locking the index fails." 3 files changed, 17 insertions(+), 3 deletions(-) e43a6

146 $ git tag -s v1.5 -m 'my signed 1.5 tag' You need a passphrase to unlock the secret key for user: "Scott Chacon <schacon@gmail.com>" 1024-bit DSA key, ID F721C45A, created gpg --list-keys $ gpg --list-keys /Users/schacon/.gnupg/pubring.gpg pub 1024D/F721C45A [expires: ] uid Scott Chacon <schacon@gmail.com> sub 2048g/45D [expires: ] git hash-object $ gpg -a --export F721C45A git hash-object -w --stdin 659ef797d181633c87ec71ac3f9ba29fe5775b92 $ git tag -a maintainer-pgp-pub 659ef797d181633c87ec71ac3f9ba29fe5775b92 git push --tagsmaintainer-pgp-pub $ git show maintainer-pgp-pub gpg --import git show <tag>

147 git describe $ git describe master v1.6.2-rc1-20-g8c5b85c git --version describe git describe-a-s git describe checkoutshow git describe git archive $ git archive master --prefix='project/' gzip > `git describe master`.tar.gz $ ls *.tar.gz v1.6.2-rc1-20-g8c5b85c.tar.gz git archive--format=zip $ git archive master --prefix='project/' --format=zip > `git describe master`.zip git shortlog

148 $ git shortlog --no-merges master --not v1.0.1 Chris Wanstrath (8): Add support for annotated tags to Grit::Tag Add packed-refs annotated tag support. Add Grit::Commit#to_patch Update version and History.txt Remove stray `puts` Make ls_tree ignore nils Tom Preston-Werner (4): fix dates in history dynamic version method Version bump to Regenerated gemspec for version 1.0.2

149 git log $ git log commit bc047d87bf7eac ae793478c50d3 Author: Scott Chacon <schacon@gmail.com> Date: Fri Jan 2 18:32: fixed refs handling, added gc auto, updated tests

150 commit d921970aadf03b3cf0e71becdaab3147ba71cdef Merge: 1c002dd... 35cfb2b... Author: Scott Chacon Date: Thu Dec 11 15:08: Merge commit 'phedders/rdocs' commit 1c002dd4b536e7479fe34593e72e6c6c1819e53b Author: Scott Chacon Date: Thu Dec 11 14:58: added some blame and merge stuff 1c002dd... git show $ git show 1c002dd4b536e7479fe34593e72e6c6c1819e53b $ git show 1c002dd4b536e7479f $ git show 1c002d --abbrev-commit git log $ git log --abbrev-commit --pretty=oneline ca82a6d changed the version number 085bb3b removed unnecessary test code a11bef0 first commit 2 80

151 p = (n(n-1)/2) * (1/2ˆ160)) topic1 ca82a6d $ git show ca82a6dff817ec66f a $ git show topic1 rev-parse rev-parse rev-parse $ git rev-parse topic1 ca82a6dff817ec66f a git reflog $ git reflog b... HEAD@{0}: commit: fixed refs handling, added gc auto, updated d HEAD@{1}: merge phedders/rdocs: Merge made by recursive. 1c002dd... HEAD@{2}: commit: added some blame and merge stuff 1c HEAD@{3}: rebase -i (squash): updating HEAD 95df HEAD@{4}: commit: # This is a combination of two commits. 1c HEAD@{5}: rebase -i (squash): updating HEAD 7e05da5... HEAD@{6}: rebase -i (pick): updating HEAD

152 @{n} $ git show HEAD@{5} master $ git show master@{yesterday} git log git log -g $ git log -g master commit bc047d87bf7eac ae793478c50d3 Reflog: master@{0} (Scott Chacon <schacon@gmail.com>) Reflog message: commit: fixed refs handling, added gc auto, updated Author: Scott Chacon <schacon@gmail.com> Date: Fri Jan 2 18:32: fixed refs handling, added gc auto, updated tests commit d921970aadf03b3cf0e71becdaab3147ba71cdef Reflog: master@{1} (Scott Chacon <schacon@gmail.com>) Reflog message: merge phedders/rdocs: Merge made by recursive. Author: Scott Chacon <schacon@gmail.com> Date: Thu Dec 11 15:08: Merge commit 'phedders/rdocs' git show HEAD@{2.months.ago} ˆ

153 $ git log --pretty=format:'%h %s' --graph * b fixed refs handling, added gc auto, updated tests * d Merge commit 'phedders/rdocs' \ * 35cfb2b Some rdoc changes * 1c002dd added some blame and merge stuff / * 1c36188 ignore *.gem * 9b29157 add open3_detach to gemspec file list HEADˆ $ git show HEAD^ commit d921970aadf03b3cf0e71becdaab3147ba71cdef Merge: 1c002dd... 35cfb2b... Author: Scott Chacon <schacon@gmail.com> Date: Thu Dec 11 15:08: Merge commit 'phedders/rdocs' ˆ d921970ˆ2 $ git show d921970^ commit 1c002dd4b536e7479fe34593e72e6c6c1819e53b Author: Scott Chacon <schacon@gmail.com> Date: Thu Dec 11 14:58: added some blame and merge stuff $ git show d921970^2 commit 35cfb2b795a55793d7cc56a6cc2060b4bb Author: Paul Hedderly <paul+git@mjr.org> Date: Wed Dec 10 22:22: Some rdoc changes ~ HEAD~ HEADˆ HEAD~2

154 HEAD~3 $ git show HEAD~3 commit 1c afb5fbcbea25b7c013f4e b8d Author: Tom Preston-Werner <tom@mojombo.com> Date: Fri Nov 7 13:47: ignore *.gem HEADˆˆˆ $ git show HEAD^^^ commit 1c afb5fbcbea25b7c013f4e b8d Author: Tom Preston-Werner <tom@mojombo.com> Date: Fri Nov 7 13:47: ignore *.gem HEAD~3ˆ2 master..experiment

155 $ git log master..experiment D C master experiment experiment..master master experiment $ git log experiment..master F E experiment $ git log origin/master..head origin git push origin/mastergit log origin/master..head git log origin/master.. ˆ --not $ git log refa..refb $ git log ^refa refb $ git log refb --not refa refa refb refc $ git log refa refb ^refc $ git log refa refb --not refc

156 masterexperiment $ git log master...experiment F E D C log log --left-right $ git log --left-right master...experiment < F < E > D > C git add-i--interactive $ git add -i staged unstaged path 1: unchanged +0/-1 TODO 2: unchanged +1/-1 index.html

157 3: unchanged +5/-1 lib/simplegit.rb *** Commands *** 1: status 2: update 3: revert 4: add untracked 5: patch 6: diff 7: quit 8: help What now> git status What now>2u What now> 2 staged unstaged path 1: unchanged +0/-1 TODO 2: unchanged +1/-1 index.html 3: unchanged +5/-1 lib/simplegit.rb Update>> Update>> 1,2 staged unstaged path * 1: unchanged +0/-1 TODO * 2: unchanged +1/-1 index.html 3: unchanged +5/-1 lib/simplegit.rb Update>> * update>> Update>> updated 2 paths *** Commands ***

158 1: status 2: update 3: revert 4: add untracked 5: patch 6: diff 7: quit 8: help What now> 1 staged unstaged path 1: +0/-1 nothing TODO 2: +1/-1 nothing index.html 3: unchanged +5/-1 lib/simplegit.rb 3r *** Commands *** 1: status 2: update 3: revert 4: add untracked 5: patch 6: diff 7: quit 8: help What now> 3 staged unstaged path 1: +0/-1 nothing TODO 2: +1/-1 nothing index.html 3: unchanged +5/-1 lib/simplegit.rb Revert>> 1 staged unstaged path * 1: +0/-1 nothing TODO 2: +1/-1 nothing index.html 3: unchanged +5/-1 lib/simplegit.rb Revert>> [enter] reverted one path *** Commands *** 1: status 2: update 3: revert 4: add untracked 5: patch 6: diff 7: quit 8: help What now> 1 staged unstaged path 1: unchanged +0/-1 TODO 2: +1/-1 nothing index.html 3: unchanged +5/-1 lib/simplegit.rb 6d git diff --cached

159 *** Commands *** 1: status 2: update 3: revert 4: add untracked 5: patch 6: diff 7: quit 8: help What now> 6 staged unstaged path 1: +1/-1 nothing index.html Review diff>> 1 diff --git a/index.html b/index.html index 4d f a/index.html ,7 Date Finder <p id="out">...</p> -<div id="footer">contact : support@github.com</div> +<div id="footer">contact : .support@github.com</div> <script type="text/javascript"> 5p diff --git a/lib/simplegit.rb b/lib/simplegit.rb index dd5ecc e a/lib/simplegit.rb ,7 class SimpleGit end def log(treeish = 'master') - command("git log -n 25 #{treeish}") + command("git log -n 30 #{treeish}") end def blame(path) Stage this hunk [y,n,a,d,/,j,j,g,e,?]?

160 ? Stage this hunk [y,n,a,d,/,j,j,g,e,?]?? y - stage this hunk n - do not stage this hunk a - stage this and all the remaining hunks in the file d - do not stage this hunk nor any of the remaining hunks in the file g - select a hunk to go to / - search for a hunk matching the given regex j - leave this hunk undecided, see next undecided hunk J - leave this hunk undecided, see next hunk k - leave this hunk undecided, see previous undecided hunk K - leave this hunk undecided, see previous hunk s - split the current hunk into smaller hunks e - manually edit the current hunk? - print help yn What now> 1 staged unstaged path 1: unchanged +0/-1 TODO 2: +1/-1 nothing index.html 3: +1/-1 +4/-0 lib/simplegit.rb git commit git add -pgit add --patch git stash

161 git status $ git status # On branch master # Changes to be committed: # (use "git reset HEAD <file>..." to unstage) # # modified: index.html # # Changes not staged for commit: # (use "git add <file>..." to update what will be committed) # # modified: lib/simplegit.rb # git stash $ git stash Saved working directory and index state \ "WIP on master: 049d078 added the index file" HEAD is now at 049d078 added the index file (To restore them type "git stash apply") $ git status # On branch master nothing to commit (working directory clean) git stash list $ git stash list stash@{0}: WIP on master: 049d078 added the index file stash@{1}: WIP on master: c Revert "added file_size" stash@{2}: WIP on master: 21d80a5... added number to log

162 git stash apply git stash apply $ git stash apply # On branch master # Changes not staged for commit: # (use "git add <file>..." to update what will be committed) # # modified: index.html # modified: lib/simplegit.rb # git stash apply --index $ git stash apply --index # On branch master # Changes to be committed: # (use "git reset HEAD <file>..." to unstage) # # modified: index.html # # Changes not staged for commit: # (use "git add <file>..." to update what will be committed) # # modified: lib/simplegit.rb # git stash drop $ git stash list stash@{0}: WIP on master: 049d078 added the index file stash@{1}: WIP on master: c Revert "added file_size"

163 WIP on master: 21d80a5... added number to log $ git stash drop stash@{0} Dropped stash@{0} (364e91f3f268f0900bc3ee613f9f733e82aaed43) git stash pop stash unapply $ git stash show -p stash@{0} git apply -R $ git stash show -p git apply -R stash-unapply $ git config --global alias.stash-unapply '!git stash show -p git apply -R' $ git stash $ #... work work work $ git stash-unapply git stash branch $ git stash branch testchanges Switched to a new branch "testchanges" # On branch testchanges # Changes to be committed:

164 # (use "git reset HEAD <file>..." to unstage) # # modified: index.html # # Changes not staged for commit: # (use "git add <file>..." to update what will be committed) # # modified: lib/simplegit.rb # Dropped refs/stash@{0} (f0dfc4d5dc332d1cee34a634182e168c4efc3359) $ git commit --amend git add git rm git commit --amend

165 git rebase-i git rebase -i HEAD~2HEAD~3~3 $ git rebase -i HEAD~3 HEAD~3..HEAD pick f7f3f6d changed my name a bit pick e updated README formatting and added blame pick a5f4a0d added cat-file # Rebase 710f0f8..a5f4a0d onto 710f0f8 # # Commands: # p, pick = use commit # e, edit = use commit, but stop for amending # s, squash = use commit, but meld into previous commit # # If you remove a line here THAT COMMIT WILL BE LOST. # However, if you remove everything, the rebase will be aborted. # log log $ git log --pretty=format:"%h %s" HEAD~3..HEAD a5f4a0d added cat-file e updated README formatting and added blame f7f3f6d changed my name a bit

166 HEAD~3 edit f7f3f6d changed my name a bit pick e updated README formatting and added blame pick a5f4a0d added cat-file $ git rebase -i HEAD~3 Stopped at 7482e0d... updated the gemspec to hopefully work better You can amend the commit now, with git commit --amend Once you re satisfied with your changes, run git rebase --continue $ git commit --amend $ git rebase --continue

167 pick f7f3f6d changed my name a bit pick e updated README formatting and added blame pick a5f4a0d added cat-file pick e updated README formatting and added blame pick f7f3f6d changed my name a bit e f7f3f6d # # Commands: # p, pick = use commit # e, edit = use commit, but stop for amending # s, squash = use commit, but meld into previous commit # # If you remove a line here THAT COMMIT WILL BE LOST. # However, if you remove everything, the rebase will be aborted. # pick f7f3f6d changed my name a bit squash e updated README formatting and added blame squash a5f4a0d added cat-file

168 # This is a combination of 3 commits. # The first commit's message is: changed my name a bit # This is the 2nd commit message: updated README formatting and added blame # This is the 3rd commit message: added cat-file rebase -i pick f7f3f6d changed my name a bit edit e updated README formatting and added blame pick a5f4a0d added cat-file f7f3f6d e git reset HEADˆ git rebase -- continue $ git reset HEAD^ $ git add README $ git commit -m 'updated README formatting' $ git add lib/simplegit.rb $ git commit -m 'added blame' $ git rebase --continue a5f4a0d

169 $ git log -4 --pretty=format:"%h %s" 1c002dd added cat-file 9b29157 added blame 35cfb2b updated README formatting f3cc40e changed my name a bit filter-branch git add. filter-branch filter-branch--tree-filter $ git filter-branch --tree-filter 'rm -f passwords.txt' HEAD Rewrite 6b9b3cf04e7c5686a9cb838c3f36a8cb6a0fc2bd (21/21) Ref 'refs/heads/master' was rewritten --tree-filter git filter-branch -- tree-filter "find * -type f -name '*~' -delete" HEAD filter-branch --all trunk filter-branch

170 $ git filter-branch --subdirectory-filter trunk HEAD Rewrite 856f0bf61e41a27326cdae8f09fe708d679f596f (12/12) Ref 'refs/heads/master' was rewritten trunk git config filter-branch --commit-filter $ git filter-branch --commit-filter ' if [ "$GIT_AUTHOR_ " = "schacon@localhost" ]; then GIT_AUTHOR_NAME="Scott Chacon"; GIT_AUTHOR_ ="schacon@example.com"; git commit-tree "$@"; else git commit-tree "$@"; fi' HEAD git blame -L

171 $ git blame -L 12,22 simplegit.rb ^4832fe2 (Scott Chacon :31: ) def show(tree = 'master') ^4832fe2 (Scott Chacon :31: ) command("git show #{tree}") ^4832fe2 (Scott Chacon :31: ) end ^4832fe2 (Scott Chacon :31: ) 9f6560e4 (Scott Chacon :52: ) def log(tree = 'master') 79eaf55d (Scott Chacon :15: ) command("git log #{tree}") 9f6560e4 (Scott Chacon :52: ) end 9f6560e4 (Scott Chacon :52: ) 42cf2861 (Magnus Chacon :45: ) def blame(path) 42cf2861 (Magnus Chacon :45: ) command("git blame #{path}") 42cf2861 (Magnus Chacon :45: ) end ˆ4832fe2 ˆ git blame-c GITServerHandler.mGITPackUpload.m GITPackUpload.m-C $ git blame -C -L 141,153 GITPackUpload.m f344f58d GITServerHandler.m (Scott ) f344f58d GITServerHandler.m (Scott ) - (void) gatherobjectshasfromc f344f58d GITServerHandler.m (Scott ) { 70befddd GITServerHandler.m (Scott ) //NSLog(@"GATHER COMMI ad11ac80 GITPackUpload.m (Scott ) ad11ac80 GITPackUpload.m (Scott ) NSString *parentsha; ad11ac80 GITPackUpload.m (Scott ) GITCommit *commit = [g ad11ac80 GITPackUpload.m (Scott ) ad11ac80 GITPackUpload.m (Scott ) //NSLog(@"GATHER COMMI ad11ac80 GITPackUpload.m (Scott ) 56ef2caf GITServerHandler.m (Scott ) if(commit) { 56ef2caf GITServerHandler.m (Scott ) [refdict setob 56ef2caf GITServerHandler.m (Scott )

172 bisect bisect git bisect start git bisect bad git bisect good [good_commit] $ git bisect start $ git bisect bad $ git bisect good v1.0 Bisecting: 6 revisions left to test after this [ecb6e1bc347ccecc5f9350d878ce677feb13d3b2] error handling on repo git bisect good $ git bisect good Bisecting: 3 revisions left to test after this [b047b02ea83310a70fd603dc8cd7a6cd13d15c04] secure this thing git bisect bad $ git bisect bad Bisecting: 1 revisions left to test after this [f71ce38690acf49c1f3c9bea38e09d82a5ce6014] drop exceptions table

173 $ git bisect good b047b02ea83310a70fd603dc8cd7a6cd13d15c04 is first bad commit commit b047b02ea83310a70fd603dc8cd7a6cd13d15c04 Author: PJ Hyett Date: Tue Jan 27 14:48: secure this thing : ee3e7821b895e52c db9bdc4c61d1730 f24d3c6ebcfc639b1a e62d60b8e68a8e4 M config git bisect reset $ git bisect reset git bisect bisect start $ git bisect start HEAD v1.0 $ git bisect run test-error.sh test-error.sh makemake tests

174 git submodule add $ git submodule add git://github.com/chneukirchen/rack.git rack Initialized empty Git repository in /opt/subtest/rack/.git/ remote: Counting objects: 3181, done. remote: Compressing objects: 100% (1534/1534), done. remote: Total 3181 (delta 1951), reused 2623 (delta 1603) Receiving objects: 100% (3181/3181), KiB 422 KiB/s, done. Resolving deltas: 100% (1951/1951), done. rack git status $ git status # On branch master # Changes to be committed: # (use "git reset HEAD <file>..." to unstage) # # new file:.gitmodules # new file: rack #.gitmodules $ cat.gitmodules [submodule "rack"] path = rack url = git://github.com/chneukirchen/rack.git.gitignore git status git diff

175 $ git diff --cached rack diff --git a/rack b/rack new file mode index d709f --- /dev/null +++ b/rack -0,0 +1 +Subproject commit 08d709f78b8c5b0fbeb7821e37fa53e69afcf433 rack master $ git commit -m 'first commit with submodule rack' [master ] first commit with submodule rack 2 files changed, 4 insertions(+), 0 deletions(-) create mode gitmodules create mode rack rack $ git log -1 commit a aad6331e620cd bb Author: Scott Chacon <schacon@gmail.com> Date: Thu Apr 9 09:03: first commit with submodule rack $ cd rack/ $ git log -1 commit 08d709f78b8c5b0fbeb7821e37fa53e69afcf433 Author: Christian Neukirchen <chneukirchen@gmail.com> Date: Wed Mar 25 14:49:

176 Document version change $ git clone git://github.com/schacon/myproject.git Initialized empty Git repository in /opt/myproject/.git/ remote: Counting objects: 6, done. remote: Compressing objects: 100% (4/4), done. remote: Total 6 (delta 0), reused 0 (delta 0) Receiving objects: 100% (6/6), done. $ cd myproject $ ls -l total 8 -rw-r-r-- 1 schacon admin 3 Apr 9 09:11 README drwxr-xr-x 2 schacon admin 68 Apr 9 09:11 rack $ ls rack/ $ rack git submodule init git submodule update $ git submodule init Submodule 'rack' (git:// github.com/ chneukirchen/ rack.git) registered for path 'rack' $ git submodule update Initialized empty Git repository in /opt/myproject/rack/.git/ remote: Counting objects: 3181, done. remote: Compressing objects: 100% (1534/1534), done. remote: Total 3181 (delta 1951), reused 2623 (delta 1603) Receiving objects: 100% (3181/3181), KiB 173 KiB/s, done. Resolving deltas: 100% (1951/1951), done. Submodule path 'rack': checked out '08d709f78b8c5b0fbeb7821e37fa53e69afcf433' rack

177 $ git merge origin/master Updating a3eee Fast forward rack files changed, 1 insertions(+), 1 deletions(-) [master*]$ git status # On branch master # Changes not staged for commit: # (use "git add <file>..." to update what will be committed) # (use "git checkout -- <file>..." to discard changes in working directory) # # modified: rack # $ git diff diff --git a/rack b/rack index 6c5e70b..08d709f a/rack Subproject commit 6c5e70b984a60b3cecd395edd5b48a7575bf58e0 +Subproject commit 08d709f78b8c5b0fbeb7821e37fa53e69afcf433 git submodule update $ git submodule update remote: Counting objects: 5, done. remote: Compressing objects: 100% (3/3), done. remote: Total 3 (delta 1), reused 2 (delta 0) Unpacking objects: 100% (3/3), done. From git@github.com:schacon/rack 08d709f..6c5e70b master -> origin/master Submodule path 'rack': checked out '6c5e70b984a60b3cecd395edd5b48a7575bf58e0'

178 git submodule update $ git submodule update fatal: reference isn t a tree: 6c5e70b984a60b3cecd395edd5b48a7575bf58e0 Unable to checkout '6c5e70b984a60b3cecd395edd5ba7575bf58e0' in submodule path 'rack' $ git log -1 rack commit 85a3eee996800fcfa91e dd4172bf76678 Author: Scott Chacon <schacon@gmail.com> Date: Thu Apr 9 09:19: added a submodule reference I will never make public. hahahahaha! git submodule update submodule update git submodule update git checkout -b work

179 $ git checkout -b rack Switched to a new branch "rack" $ git submodule add git@github.com:schacon/rack.git rack Initialized empty Git repository in /opt/myproj/rack/.git/... Receiving objects: 100% (3184/3184), KiB 34 KiB/s, done. Resolving deltas: 100% (1952/1952), done. $ git commit -am 'added rack submodule' [rack cc49a69] added rack submodule 2 files changed, 4 insertions(+), 0 deletions(-) create mode gitmodules create mode rack $ git checkout master Switched to branch "master" $ git status # On branch master # Untracked files: # (use "git add <file>..." to include in what will be committed) # # rack/ submodule add $ rm -Rf rack/ $ git submodule add git@github.com:schacon/rack.git rack 'rack' already exists in the index rack $ git rm -r rack $ git submodule add git@github.com:schacon/rack.git rack Initialized empty Git repository in /opt/testsub/rack/.git/ remote: Counting objects: 3184, done. remote: Compressing objects: 100% (1465/1465), done. remote: Total 3184 (delta 1952), reused 2770 (delta 1675) Receiving objects: 100% (3184/3184), KiB 88 KiB/s, done.

180 Resolving deltas: 100% (1952/1952), done. $ git checkout master error: Untracked working tree file 'rack/authors' would be overwritten by merge. rack $ mv rack /tmp/ $ git checkout master Switched to branch "master" $ ls README rack rackgit submodule update /tmp/rack $ git remote add rack_remote git@github.com:schacon/rack.git $ git fetch rack_remote warning: no common commits remote: Counting objects: 3184, done.

181 remote: Compressing objects: 100% (1465/1465), done. remote: Total 3184 (delta 1952), reused 2770 (delta 1675) Receiving objects: 100% (3184/3184), KiB 4 KiB/s, done. Resolving deltas: 100% (1952/1952), done. From git@github.com:schacon/rack * [new branch] build -> rack_remote/build * [new branch] master -> rack_remote/master * [new branch] rack-0.4 -> rack_remote/rack-0.4 * [new branch] rack-0.9 -> rack_remote/rack-0.9 $ git checkout -b rack_branch rack_remote/master Branch rack_branch set up to track remote branch refs/remotes/rack_remote/master. Switched to a new branch "rack_branch" rack_branch master $ ls AUTHORS KNOWN-ISSUES Rakefile contrib lib COPYING README bin example test $ git checkout master Switched to branch "master" $ ls README master git readtreeread-tree master rack_branchmasterrack $ git read-tree --prefix=rack/ -u rack_branch $ git checkout rack_branch $ git pull git merge -s subtree -s subtree--squash --no-commit

182 $ git checkout master $ git merge --squash -s subtree --no-commit rack_branch Squash commit -- not updating HEAD Automatic merge went well; stopped before committing as requested rackrack_branch rackrack_branch diffgit diff-tree $ git diff-tree -p rack_branch rack master $ git diff-tree -p rack_remote/master

183 git config $ git config --global user.name "John Doe" $ git config --global user. johndoe@example.com /etc/gitconfig --systemgit config ~/.gitconfig --global.git/config.git/config /etc/gitconfig.git/ configgit config

184 $ git config --help git config core.editor $ git config --global core.editor emacs $HOME/.gitmessage.txt subject line what happened [ticket: X] commit.template git commit.template commit $ git config --global commit.template $HOME/.gitmessage.txt $ git commit subject line what happened [ticket: X]

185 # Please enter the commit message for your changes. Lines starting # with '#' will be ignored, and an empty message aborts the commit. # On branch master # Changes to be committed: # (use "git reset HEAD <file>..." to unstage) # # modified: lib/test.rb # ~ ~ ".git/commit_editmsg" 14L, 297C log diffmore less $ git config --global core.pager '' $ git config --global user.signingkey <gpg-key-id> git tag $ git tag -s <tag-name>.gitignore git add core.excludesfile.gitignore

186 $ git com git: 'com' is not a git-command. See 'git --help'. Did you mean this? commit help.autocorrect color.ui $ git config --global color.ui true color.ui = always --color color.ui = true color.* true false always color.branch color.diff color.interactive color.status

187 $ git config --global color.diff.meta blue black bold git config /usr/local/bin p4merge extmergep4merge $ cat /usr/local/bin/extmerge #!/bin/sh /Applications/p4merge.app/Contents/MacOS/p4merge $* path old-file old-hex old-mode new-file new-hex new-mode old-file new-file $ cat /usr/local/bin/extdiff #!/bin/sh [ $# -eq 7 ] && /usr/local/bin/extmerge "$2" "$5"

188 $ sudo chmod +x /usr/local/bin/extmerge $ sudo chmod +x /usr/local/bin/extdiff merge.tool mergetool.*.cmd mergetool.trustexitcode diff.external $ git config --global merge.tool extmerge $ git config --global mergetool.extmerge.cmd \ 'extmerge "$BASE" "$LOCAL" "$REMOTE" "$MERGED"' $ git config --global mergetool.trustexitcode false $ git config --global diff.external extdiff ~/.gitconfig [merge] tool = extmerge [mergetool "extmerge"] cmd = extmerge \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\" trustexitcode = false [diff] external = extdiff $ git diff 32d1776b1^ 32d1776b1 git mergetool extdiff extmerge extmerge $ cat /usr/local/bin/extmerge #!/bin/sh /Applications/kdiff3.app/Contents/MacOS/kdiff3 $*

189 $ git config --global merge.tool kdiff3 extmerge extdiff core.autocrlf true $ git config --global core.autocrlf true

190 core.autocrlf $ git config --global core.autocrlf input false $ git config --global core.autocrlf false trailing-space space-before-tab trailing-space space-before-tab indent-with-non-tab cr-at-eol indent-with-non-tab cr-at-eol core.whitespace - cr-at-eol $ git config --global core.whitespace \ trailing-space,space-before-tab,indent-with-non-tab git diff git apply $ git apply --whitespace=warn <patch> $ git apply --whitespace=fix <patch>

191 --whitespace=fixrebase receive.fsckobjects $ git config --system receive.fsckobjects true -f receive.denynonfastforwards $ git config --system receive.denynonfastforwards true denynonfastforwards receive.denydeletes $ git config --system receive.denydeletes true

192 .gitattributes.git/info/attributes.pbxproj pbxproj.gitattributes *.pbxproj -crlf -diff -crlf -diff *.pbxproj binary strings strings

193 strings git diff $ git diff diff --git a/chapter1.doc b/chapter1.doc index 88839c4..4afcb7c Binary files a/chapter1.doc and b/chapter1.doc differ.gitattributes *.doc diff=word strings $ git config diff.word.textconv catdoc.git/config [diff "word"] textconv = catdoc.doc git diff $ git diff diff --git a/chapter1.doc b/chapter1.doc index c1c8a0a..b93c9e a/chapter1.doc

194 +++ b/chapter1.doc -128,7 +128,7 and data size) Since its birth in 2005, Git has evolved and matured to be easy to use and yet retain these initial qualities. It s incredibly fast, it s very efficient with large projects, and it has an incredible branching -system for non-linear development. +system for non-linear development (See Chapter 3). strings *.doc *.odt.gitattributes *.odt diff=odt odt.git/config [diff "odt"] binary = true textconv = /usr/local/bin/odt-to-txt /usr/local/ bin/odt-to-txt #! /usr/bin/env perl # Simplistic OpenDocument Text (.odt) to plain text converter. # Author: Philipp Kempgen if (! defined($argv[0])) { print STDERR "No filename given!\n"; print STDERR "Usage: $0 filename\n"; exit 1;

195 } my $content = ''; open my $fh, '- ', 'unzip', '-qq', '-p', $ARGV[0], 'content.xml' or die $!; { local $/ = undef; # slurp mode $content = <$fh>; } close $fh; $_ = $content; s/<text:span\b[^>]*>//g; # remove spans s/<text:h\b[^>]*>/\n\n***** /g; # headers s/<text:list-item\b[^>]*>\s*<text:p\b[^>]*>/\n -- /g; # list items s/<text:list\b[^>]*>/\n\n/g; # lists s/<text:p\b[^>]*>/\n /g; # paragraphs s/<[^>]+>//g; # remove all XML tags s/\n{2,}/\n\n/g; # remove multiple blank lines s/\a\n+//; # remove leading blank lines print "\n", $_, "\n\n"; chmod +x /usr/local/bin/odt-to-txt git diff.odt exiftool $ echo '*.png diff=exif' >>.gitattributes $ git config diff.exif.textconv exiftool git diff diff --git a/image.png b/image.png index 88839c4..4afcb7c a/image.png ,12

196 ExifTool Version Number : File Size : 70 kb -File Modification Date/Time : 2009:04:17 10:12:35-07:00 +File Size : 94 kb +File Modification Date/Time : 2009:04:21 07:02:43-07:00 File Type : PNG MIME Type : image/png -Image Width : Image Height : 889 +Image Width : Image Height : 827 Bit Depth : 8 Color Type : RGB with Alpha $Id$ $ echo '*.txt ident' >>.gitattributes $ echo '$Id$' > test.txt $ rm test.txt $ git checkout -- test.txt $ cat test.txt $Id: 42812b7653c7b88933f8a9d6cad0ca16714b9bb3 $.gitattributes

197 indent.gitattributes *.c *.c filter=indent $ git config --global filter.indent.clean indent $ git config --global filter.indent.smudge cat *.c indent cat catindent $Date$

198 #! /usr/bin/env ruby data = STDIN.read last_date = `git log --pretty=format:"%ad" -1` puts data.gsub('$date$', '$Date: ' + last_date.to_s + '$') git log$date$ $Date$ expand_date daterexpand_date $ git config filter.dater.smudge expand_date $ git config filter.dater.clean 'perl -pe "s/\\\$date[^\\\$]*\\\$/\\\$date\\\ $/"' $Date$$Date$ $Date$ $ echo '# $Date$' > date_test.txt $ echo 'date*.txt filter=dater' >>.gitattributes $ git add date_test.txt.gitattributes $ git commit -m "Testing date expansion in Git" $ rm date_test.txt $ git checkout date_test.txt $ cat date_test.txt # $Date: Tue Apr 21 07:26: $.gitattributes dater

199 export-ignore test/ test/ export-ignore --pretty=format $Format:$ LAST_COMMIT git archive $ echo 'Last commit date: $Format:%cd$' > LAST_COMMIT $ echo "LAST_COMMIT export-subst" >>.gitattributes $ git add LAST_COMMIT.gitattributes $ git commit -am 'adding LAST_COMMIT file for archives' git archive $ cat LAST_COMMIT Last commit date: $Format:Tue Apr 21 08:38: $ database.xml merge=ours

200 $ git merge topic Auto-merging database.xml Merge made by recursive. hooks.git/hooks hooks pre-commit git commit --no-verify prepare-commit-msg commit-msg

201 post-commitgit log -1 HEAD git am git format-patch applypatch-msg git am pre-applypatch git am git ampost-applypatch pre-rebase pre-rebase git checkoutpost-checkout mergepost-merge pre-receive

202 post-receive pre-receive pre-receive pre-receive $USER #!/usr/bin/env ruby $refname = ARGV[0] $oldrev = ARGV[1] $newrev = ARGV[2] $user = ENV['USER']

203 puts "Enforcing Policies... \n(#{$refname}) (#{$oldrev[0,6]}) (#{$newrev[0,6]})" $newrev $oldrev git rev-list git rev-list git log $ git rev-list 538c33..d14fc7 d14fc7c847ab946ec39590d87783c69b031bdfb7 9f585da4401b0a3999e d15245c13f0be a1be950e2a8d078e6141f5cd20c1e61ad3 dfa04c9ef3d f13fb5b9b1fb7717d2222a 17716ec0f1ff5c77eff40b7fe912f9f6cfd0e475 git cat-file $ git cat-file commit ca82a6 tree cfda3bf379e4f8dba8717dee55aab78aef7f4daf parent 085bb3bcb608e1e8451d4b2432f8ecbe6306e7e7 author Scott Chacon <schacon@gmail.com> committer Scott Chacon <schacon@gmail.com> changed the version number sed

204 $ git cat-file commit ca82a6 sed '1,/^$/d' changed the version number $regex = /\[ref: (\d+)\]/ # 指定提交信息格式 def check_message_format missed_revs = `git rev-list #{$oldrev}..#{$newrev}`.split("\n") missed_revs.each do rev message = `git cat-file commit #{rev} sed '1,/^$/d'` if!$regex.match(message) puts "[POLICY] Your message is not formatted correctly" exit 1 end end end check_message_format update acl update avail unavail doc lib tests avail nickh,pjhyett,defunkt,tpw avail usinclair,cdickens,ebronte doc avail schacon lib avail schacon tests

205 avail unavail def get_acl_access_data(acl_file) # read in ACL data acl_file = File.read(acl_file).split("\n").reject { line line == '' } access = {} acl_file.each do line avail, users, path = line.split(' ') next unless avail == 'avail' users.split(',').each do user access[user] = [] access[user] << path end end access end get_acl_access_data {"defunkt"=>[nil], "tpw"=>[nil], "nickh"=>[nil], "pjhyett"=>[nil], "schacon"=>["lib", "tests"], "cdickens"=>["doc"], "usinclair"=>["doc"], "ebronte"=>["doc"]} git log --name-only $ git log -1 --name-only --pretty=format:'' 9f585d README lib/test.rb

206 get_acl_access_data # 仅允许特定用户修改项目中的特定子目录 def check_directory_perms access = get_acl_access_data('acl') # 检查是否有人在向他没有权限的地方推送内容 new_commits = `git rev-list #{$oldrev}..#{$newrev}`.split("\n") new_commits.each do rev files_modified = `git log name- only -- pretty=format:'' #{rev}`.split("\n") files_modified.each do path next if path.size == 0 has_file_access = false access[$user].each do access_path if!access_path # 用户拥有完全访问权限 (path.index(access_path) == 0) # 或者对此位置有访问权限 has_file_access = true end end if!has_file_access puts "[POLICY] You do not have access to push to #{path}" exit 1 end end end end check_directory_perms git rev-list path.index(access_path) ==0 access_path access_path receive.denydeletes receive.denynonfastforwards

207 # 只允许纯 fast-forward 推送 def check_fast_forward missed_refs = `git rev-list #{$newrev}..#{$oldrev}` missed_ref_count = missed_refs.split("\n").size if missed_ref_count > 0 puts "[POLICY] Cannot push a non fast-forward reference" exit 1 end end check_fast_forward chmod u+x.git/hooks/update $ git push -f origin master Counting objects: 5, done. Compressing objects: 100% (3/3), done. Writing objects: 100% (3/3), 323 bytes, done. Total 3 (delta 1), reused 0 (delta 0) Unpacking objects: 100% (3/3), done. Enforcing Policies... (refs/heads/master) (8338c5) (c5b616) [POLICY] Cannot push a non fast-forward reference error: hooks/update exited with error code 1 error: hook declined to update refs/heads/master To git@gitserver:project.git! [remote rejected] master -> master (hook declined) error: failed to push some refs to 'git@gitserver:project.git' Enforcing Policies... (refs/heads/master) (8338c5) (c5b616)

208 [POLICY] Cannot push a non fast-forward reference error: hooks/update exited with error code 1 error: hook declined to update refs/heads/master To git@gitserver:project.git! [remote rejected] master -> master (hook declined) error: failed to push some refs to 'git@gitserver:project.git' [POLICY] Your message is not formatted correctly lib [POLICY] You do not have access to push to lib/test.rb update

209 #!/usr/bin/env ruby message_file = ARGV[0] message = File.read(message_file) $regex = /\[ref: (\d+)\]/ if!$regex.match(message) puts "[POLICY] Your message is not formatted correctly" exit 1 end.git/hooks/commit-msg $ git commit -am 'test' [POLICY] Your message is not formatted correctly $ git commit -am 'test [ref: 132]' [master e05c914] test [ref: 132] 1 files changed, 1 insertions(+), 0 deletions(-) #!/usr/bin/env ruby $user = ENV['USER'] # [ insert acl_access_data method from above ] # 只允许特定用户修改项目重特定子目录的内容 def check_directory_perms access = get_acl_access_data('.git/acl') files_modified = `git diff-index --cached --name-only HEAD`.split("\n") files_modified.each do path

210 next if path.size == 0 has_file_access = false access[$user].each do access_path if!access_path (path.index(access_path) == 0) has_file_access = true end if!has_file_access puts "[POLICY] You do not have access to push to #{path}" exit 1 end end end check_directory_perms access = get_acl_access_data('acl') access = get_acl_access_data('.git/acl') files_modified = `git log -1 --name-only --pretty=format:'' #{ref}` files_modified = `git diff-index --cached --name-only HEAD` $user

211 #!/usr/bin/env ruby base_branch = ARGV[0] if ARGV[1] topic_branch = ARGV[1] else topic_branch = "HEAD" end target_shas = `git rev-list #{base_branch}..#{topic_branch}`.split("\n") remote_refs = `git branch -r`.split("\n").map { r r.strip } target_shas.each do sha remote_refs.each do remote_ref shas_pushed = `git rev-list ^#{sha}^@ refs/remotes/#{remote_ref}` if shas_pushed.split("\n").include?(sha) puts "[POLICY] Commit #{sha} has already been pushed to #{remote_ref}" exit 1 end end end git rev-list ^#{sha}^@ refs/remotes/#{remote_ref} SHAˆ@ -f

212

213 git svn git svn git svn git svn

214 svnsync $ mkdir /tmp/test-svn $ svnadmin create /tmp/test-svn $ cat /tmp/test-svn/hooks/pre-revprop-change #!/bin/sh exit 0; $ chmod +x /tmp/test-svn/hooks/pre-revprop-change svnsync init $ svnsync init file:///tmp/test-svn $ svnsync sync file:///tmp/test-svn Committed revision 1. Copied properties for revision 1. Committed revision 2. Copied properties for revision 2. Committed revision git svn clone

215 file:/// tmp/test-svn $ git svn clone file:///tmp/test-svn -T trunk -b branches -t tags Initialized empty Git repository in / Users/ schacon/ projects/ testsvnsync/ svn/.git/ r1 = b4e387bc68740b5af56c2a5faf4003ae42bd135c (trunk) A m4/acx_pthread.m4 A m4/stl_hash.m4... r75 = d1957f3b eec6314e15bcda59e3d9610 (trunk) Found possible branch point: file:///tmp/test-svn/trunk => \ file:///tmp/test-svn /branches/my-calc-branch, 75 Found branch parent: (my-calc-branch) d1957f3b eec6314e15bcda59e3d9610 Following parent with do_switch Successfully followed parent r76 = ecc0badd73f40ea2f01fce b01 (my-calc-branch) Checked out HEAD: file:///tmp/test-svn/branches/my-calc-branch r76 git svn init git svn fetch -T trunk -b branches -t tags -s $ git svn clone file:///tmp/test-svn -s $ git branch -a * master my-calc-branch tags/2.0.2 tags/release tags/release tags/release-2.0.2rc1 trunk

216 origin/[branch] git svn show-ref $ git show-ref 1cbd4904d9982f386d87f88fce1c24ad7c0f0471 refs/heads/master aee1ecc f355a883f5d99cff0c852d3c4 refs/remotes/my-calc-branch 03d09b0e2aad427e34a6d50ff147128e76c0e0f5 refs/remotes/tags/ d02cc0adc9da4319eeba ba219b9c376 refs/remotes/tags/release caaa711a50c77879a91b8b f672745cb refs/remotes/tags/release c4cb508144c513ff1214c3488abe66dcb92916f refs/remotes/tags/release-2.0.2rc1 1cbd4904d9982f386d87f88fce1c24ad7c0f0471 refs/remotes/trunk $ git show-ref 83e38c7a0af325a9722f2fdc56b d83a1 refs/heads/master 3e15e38c198baac84223acfc6224bb8b99ff2281 refs/remotes/gitserver/master 0a30dd3b0c795b80212ae723640d4e5d48cabdff refs/remotes/origin/master fdd55f916652be4881c6f11600d6f refs/remotes/origin/testing gitserver master origin master testing git svn $ git commit -am 'Adding git-svn instructions to the README' [master 97031e5] Adding git-svn instructions to the README 1 files changed, 1 insertions(+), 1 deletions(-) git svn dcommit

217 $ git svn dcommit Committing to file:///tmp/test-svn/trunk... M README.txt Committed r79 M README.txt r79 = 938b1a547c2cc92033b74d32030e a5c8 (trunk) No changes between current HEAD and refs/remotes/trunk Resetting to the latest refs/remotes/trunk gitsvn-id $ git log -1 commit 938b1a547c2cc92033b74d32030e a5c8 Author: schacon <schacon@4c93b f-11de-be05-5f7a > Date: Sat May 2 22:06: Adding git-svn instructions to the README git- svn- id: file:/// tmp/ test- svn/ trunk@79 4c93b f-11debe05-5f7a e5 938b1a5 dcommit git svn $ git svn dcommit Committing to file:///tmp/test-svn/trunk... Merge conflict during commit: Your file or directory 'README.txt' is probably \ out-of-date: resource out of date; try updating at /Users/schacon/libexec/git-\ core/git-svn line 482

218 git svn rebase $ git svn rebase M README.txt r80 = ff829ab914e8775c7c025d741beb3d523ee30bc4 (trunk) First, rewinding head to replay your work on top of it... Applying: first user change dcommit $ git svn dcommit Committing to file:///tmp/test-svn/trunk... M README.txt Committed r81 M README.txt r81 = 456cbe6337abe49154db70106d1836bc1332deed (trunk) No changes between current HEAD and refs/remotes/trunk Resetting to the latest refs/remotes/trunk git svn dcommit $ git svn dcommit Committing to file:///tmp/test-svn/trunk... M configure.ac Committed r84 M autogen.sh r83 = 8aa54a74d452f82eee10076ab2584c1fc424853b (trunk) M configure.ac r84 = cdbac939211ccb18aa744e581e46563af5d962d0 (trunk) W: d2f23b80f67aaaa1f6f5aaef48fce3263ac71a92 and refs/remotes/trunk differ, \ using rebase: : efa5a59965fbbb5b2b0a12890f1b351bb5493c18 \ 015e4c98c482f0fa71e4d b37fa6 M autogen.sh First, rewinding head to replay your work on top of it... Nothing to do.

219 sit svn fetch git svn rebase $ git svn rebase M generate_descriptor_proto.sh r82 = bd16df9173e424c6f52c337ab6efa7f f1 (trunk) First, rewinding head to replay your work on top of it... Fast-forwarded master to refs/remotes/trunk. git svn rebase git svn rebase experiment master dcommit $ git svn dcommit Committing to file:///tmp/test-svn/trunk... M CHANGES.txt Committed r85 M CHANGES.txt r85 = 4bfebeec434d156c36f2bcd18f4e3d97dc3269a2 (trunk) No changes between current HEAD and refs/remotes/trunk Resetting to the latest refs/remotes/trunk COPYING.txt: locally modified INSTALL.txt: locally modified M COPYING.txt M INSTALL.txt Committed r86 M INSTALL.txt M COPYING.txt r86 = 2647f6b86ccfcaad4ec58c520e369ec81f7c283c (trunk) No changes between current HEAD and refs/remotes/trunk Resetting to the latest refs/remotes/trunk

220 dcommit experiment git svn branch [ 分支名 ] $ git svn branch opera Copying file:///tmp/ test- svn/ trunk at r87 to file:/// tmp/test- svn/ branches/ opera... Found possible branch point: file:///tmp/test-svn/trunk => \ file:///tmp/test-svn/branches/opera, 87 Found branch parent: (opera) 1f6bfe471083cbca06ac8d4176f7ad4de0d62e5f Following parent with do_switch Successfully followed parent r89 = 9b6fe0b90c5c9adf9165f dbc54a7cbf (opera) svn copy trunk branches/opera trunk opera git-svn-id dcommit opera $ git branch opera remotes/opera opera trunk master git merge -m Merge branch opera

221 git merge dcommit git merge git merge --squash opera git svn git svn log $ git svn log r87 schacon :07: (Sat, 02 May 2009) 2 lines autogen change r86 schacon :00: (Sat, 02 May 2009) 2 lines Merge branch 'experiment' r85 schacon :00: (Sat, 02 May 2009) 2 lines updated the changelog git svn log svn log

222 git svn log git log svn annotate git svn blame [ 文件名 ] $ git svn blame README.txt 2 temporal Protocol Buffers - Google's data interchange format 2 temporal Copyright 2008 Google Inc. 2 temporal 2 temporal 22 temporal C++ Installation - Unix 22 temporal ======================= 2 temporal 79 schacon Committing in git-svn. 78 schacon 2 temporal To build and install the C++ Protocol Buffer runtime and the Protocol 2 temporal Buffer compiler (protoc) execute the following: 2 temporal git svn info svn info $ git svn info Path:. URL: Repository Root: Repository UUID: 4c93b f-11de-be05-5f7a Revision: 87 Node Kind: directory Schedule: normal Last Changed Author: schacon Last Changed Rev: 87 Last Changed Date: :07: (Sat, 02 May 2009) blame log svn:ignore.gitignore git svn

223 git svn create-ignore.gitignore git svn show-ignore.gitignore $ git svn show-ignore >.git/info/exclude.gitignore.gitignore git svn git merge git-svn-id pre-receive git-svn-id git svn git svn clone

224 schacon blame git svn log user.txt schacon = Scott Chacon <schacon@ge .com> selse = Someo Nelse <selse@ge .com> $ svn log ^/ --xml grep -P "^<author" sort -u \ perl -pe 's/<author>(.*?)<\/author>/$1 = /' > users.txt grep sort perl git svn clone init --no-metadata git svn import $ git svn clone \ --authors-file=users.txt --no-metadata -s my_project my_project commit 37efa680e8473b615de980fa a35a Author: schacon <schacon@4c93b f-11de-be05-5f7a > Date: Sun May 3 00:12: fixed install - go to trunk trunk@94 4c93b f-11debe05-5f7a git- svn- id: my- project.googlecode.com/ svn/

225 commit 03a8785f44c8ea5cdb0e8834b7c8e6c469be2ff2 Author: Scott Chacon Date: Sun May 3 00:12: fixed install - go to trunk git-svn-id post-import( 导入后 ) git svn $ git for- each- ref refs/ remotes/ tags cut - d / - f 4- grep - while read tagname; do git tag "$tagname" "tags/$tagname"; git branch - r -d "tags/$tagname"; done tag/ refs/remotes $ git for- each- ref refs/ remotes cut - d / - f 3- grep - while read branchname; do git branch "$branchname" "refs/ remotes/ $branchname"; git branch -r -d "$branchname"; done $ git remote add origin git@my-git-server:myrepository.git $ git push origin --all $ git push origin --tags

226 contrib git svn $ git clone git://git.kernel.org/pub/scm/git/git.git $ cd git/contrib/fast-import fast-import git-p4 p4 $ export P4PORT=public.perforce.com:1666 git-p4 clone $ git-p4 clone //public/jam/src@all /opt/p4import Importing from //public/jam/src@all into /opt/p4import Reinitialized existing Git repository in /opt/p4import/.git/ Import destination: refs/remotes/p4/master Importing revision 4409 (100%) /opt/p4import git log $ git log -2 commit 1fd4ec efd2db83548b85b1bbbc07dc2 Author: Perforce staff <support@perforce.com> Date: Thu Aug 19 10:18: Drop 'rc3' moniker of jam-2.5. the main part of the document. Folded rc2 and rc3 RELNOTES into Built new tar/zip balls. Only 16 months later. [git-p4: depot-paths = "//public/jam/src/": change = 4409] commit ca8870db541a23ed867f38847eda65bf d

227 Author: Richard Geiger Date: Tue Apr 22 20:51: Update derived jamgram.c [git-p4: depot-paths = "//public/jam/src/": change = 3108] git-p4 git filter-branch $ git filter-branch --msg-filter ' sed -e "/^\[git-p4:/d" ' Rewrite 1fd4ec efd2db83548b85b1bbbc07dc2 (123/123) Ref 'refs/heads/master' was rewritten git log git-p4 $ git log -2 commit 10a16d60cffca14d454a15c f4082bc5b0 Author: Perforce staff <support@perforce.com> Date: Thu Aug 19 10:18: Drop 'rc3' moniker of jam-2.5. the main part of the document. Folded rc2 and rc3 RELNOTES into Built new tar/zip balls. Only 16 months later. commit 2b6c6db311dd76c34c66ec1c40a49405e6b527b2 Author: Richard Geiger <rmg@perforce.com> Date: Tue Apr 22 20:51: Update derived jamgram.c

228 git fast-import git fast-import back_yy_mm_dd $ ls /opt/import_from back_2009_01_02 back_2009_01_04 back_2009_01_14 back_2009_02_03 current fast-import \r last_mark = nil # 循环遍历所有目录 Dir.chdir(ARGV[0]) do Dir.glob("*").each do dir next if File.file?(dir) # 进入目标目录 Dir.chdir(dir) do last_mark = print_export(dir, last_mark) end end

229 end print_export fast-import print_export mark = convert_dir_to_mark(dir) $marks = [] def convert_dir_to_mark(dir) if!$marks.include?(dir) $marks << dir end ($marks.index(dir) + 1).to_s end print_export date = convert_dir_to_date(dir) convert_dir_to_date def convert_dir_to_date(dir) if dir == 'current' return Time.now().to_i else dir = dir.gsub('back_', '') (year, month, day) = dir.split('_') return Time.local(year, month, day).to_i end end

230 $author = 'Scott Chacon <schacon@example.com>' # 打印导入所需的信息 puts 'commit refs/heads/master' puts 'mark :' + mark puts "committer #{$author} #{date} -0700" export_data('imported from ' + dir) puts 'from :' + last_mark if last_mark data (size)\n(contents) export_data def export_data(string) end print "data #{string.size}\n#{string}" deleeall puts 'deleteall' Dir.glob("**/*").each do file next if!file.file?(file) inline_data(file) end

231 fast-import M 644 inline path/to/file data (size) (file contents) inline_data def inline_data(file, code = 'M', mode = '644') content = File.read(file) puts "#{code} #{mode} inline #{file}" export_data(content) end export_data return mark $stdout.binmode $ ruby import.rb /opt/import_from commit refs/heads/master mark :1 committer Scott Chacon <schacon@ge .com> data 29 imported from back_2009_01_02deleteall M 644 inline file.rb

232 data 12 version two commit refs/heads/master mark :2 committer Scott Chacon data 29 imported from back_2009_01_04from :1 deleteall M 644 inline file.rb data 14 version three M 644 inline new.rb data 16 new version one (...) git fast-import git init $ git init Initialized empty Git repository in /opt/import_to/.git/ $ ruby import.rb /opt/import_from git fast-import git-fast-import statistics: Alloc'd objects: 5000 Total objects: 18 ( 1 duplicates ) blobs : 7 ( 1 duplicates 0 deltas) trees : 6 ( 0 duplicates 1 deltas) commits: 5 ( 0 duplicates 0 deltas) tags : 0 ( 0 duplicates 0 deltas) Total branches: 1 ( 1 loads ) marks: 1024 ( 5 unique ) atoms: 3 Memory total: 2255 KiB pools: 2098 KiB objects: 156 KiB pack_report: getpagesize() = 4096 pack_report: core.packedgitwindowsize = pack_report: core.packedgitlimit = pack_report: pack_used_ctr = 9 pack_report: pack_mmap_calls = 5 pack_report: pack_open_windows = 1 / 1

233 pack_report: pack_mapped = 1356 / git log $ git log -2 commit 10bfe7d22ce15ee25b60a824c ca593d41 Author: Scott Chacon <schacon@example.com> Date: Sun May 3 12:57: imported from current commit 7e519590de754d079dd73b44d695a42c9d2df452 Author: Scott Chacon <schacon@example.com> Date: Tue Feb 3 01:00: imported from back_2009_02_03 master $ ls $ git reset --hard master HEAD is now at 10bfe7d imported from current $ ls file.rb lib fast-import contib/fast-import git-p4

234

235 checkout branch remote git init.git $ ls HEAD branches/ config

236 description hooks/ index info/ objects/ refs/ git init branches description config info hooks HEAD index objects refs objects refs HEAD index hashobject.git objects $ mkdir test $ cd test $ git init Initialized empty Git repository in /tmp/test/.git/ $ find.git/objects.git/objects.git/objects/info.git/objects/pack $ find.git/objects -type f $ objects pack info $ echo 'test content' git hash-object -w --stdin d670460b4b4aece5915caf5c68d12f560a9fe3e4

237 -w hash-object --stdin $ find.git/objects -type f.git/objects/d6/70460b4b4aece5915caf5c68d12f560a9fe3e4 objects cat-file - p $ git cat-file -p d670460b4b4aece5915caf5c68d12f560a9fe3e4 test content $ echo 'version 1' > test.txt $ git hash-object -w test.txt 83baae61804e65cc73a7201a c76066a30 $ echo 'version 2' > test.txt $ git hash-object -w test.txt 1f7a7a472abf3dd9643fd615f6da379c4acb3e3a $ find.git/objects -type f.git/objects/1f/7a7a472abf3dd9643fd615f6da379c4acb3e3a.git/objects/83/baae61804e65cc73a7201a c76066a30.git/objects/d6/70460b4b4aece5915caf5c68d12f560a9fe3e4

238 $ git cat-file -p 83baae61804e65cc73a7201a c76066a30 > test.txt $ cat test.txt version 1 $ git cat-file -p 1f7a7a472abf3dd9643fd615f6da379c4acb3e3a > test.txt $ cat test.txt version 2 cat-file -t $ git cat-file -t 1f7a7a472abf3dd9643fd615f6da379c4acb3e3a blob $ git cat-file -p master^{tree} blob a906cb2a4a904a152e80877d daad0c859 README blob 8f f9404f26296befa88755fc2598c289 Rakefile tree 99f1a6d12cb4b6f19c8655fca46c3ecf317074e0 lib masterˆ{tree} branch lib $ git cat-file -p 99f1a6d12cb4b6f19c8655fca46c3ecf317074e blob 47c6340d6459e05787f644c2447d2595f5d3a54b simplegit.rb

239 update-index --add -- cacheinfo $ git update-index --add --cacheinfo \ 83baae61804e65cc73a7201a c76066a30 test.txt write-tree -w write-tree $ git write-tree d8329fc1cc938780ffdd9f94e0d364e0ea74f579 $ git cat-file -p d8329fc1cc938780ffdd9f94e0d364e0ea74f blob 83baae61804e65cc73a7201a c76066a30 test.txt $ git cat-file -t d8329fc1cc938780ffdd9f94e0d364e0ea74f579 tree

240 $ echo 'new file' > new.txt $ git update-index test.txt $ git update-index --add new.txt $ git write-tree 0155eb a0f03eb265b69f5a2d56f341 $ git cat-file -p 0155eb a0f03eb265b69f5a2d56f blob fa49b ad f2a75f74e3671e92 new.txt blob 1f7a7a472abf3dd9643fd615f6da379c4acb3e3a test.txt 1f7a7a read-tree --prefix read-tree $ git read-tree --prefix=bak d8329fc1cc938780ffdd9f94e0d364e0ea74f579 $ git write-tree 3c4e9cd789d88d8d89c c3585e41b0e614 $ git cat-file -p 3c4e9cd789d88d8d89c c3585e41b0e tree d8329fc1cc938780ffdd9f94e0d364e0ea74f579 bak blob fa49b ad f2a75f74e3671e92 new.txt blob 1f7a7a472abf3dd9643fd615f6da379c4acb3e3a test.txt bak commit-tree

241 $ echo 'first commit' git commit-tree d8329f fdf4fc3344e67ab068f836878b6c4951e3b15f3d cat-file $ git cat-file -p fdf4fc3 tree d8329fc1cc938780ffdd9f94e0d364e0ea74f579 author Scott Chacon <schacon@gmail.com> committer Scott Chacon <schacon@gmail.com> first commit user.name user. $ echo 'second commit' git commit-tree 0155eb -p fdf4fc3 cac0cab538b970a37ea1e769cbbde608743bc96d $ echo 'third commit' git commit-tree 3c4e9c -p cac0cab 1a410efbd13591db ebc7a059dd55cfe9 git log

242 $ git log --stat 1a410e commit 1a410efbd13591db ebc7a059dd55cfe9 Author: Scott Chacon Date: Fri May 22 18:15: third commit bak/test.txt files changed, 1 insertions(+), 0 deletions(-) commit cac0cab538b970a37ea1e769cbbde608743bc96d Author: Scott Chacon <schacon@gmail.com> Date: Fri May 22 18:14: second commit new.txt 1 + test.txt files changed, 2 insertions(+), 1 deletions(-) commit fdf4fc3344e67ab068f836878b6c4951e3b15f3d Author: Scott Chacon <schacon@gmail.com> Date: Fri May 22 18:09: first commit test.txt files changed, 1 insertions(+), 0 deletions(-) git add git commit.git/objects $ find.git/objects -type f.git/objects/01/55eb a0f03eb265b69f5a2d56f341 # tree 2.git/objects/1a/410efbd13591db ebc7a059dd55cfe9 # commit 3.git/objects/1f/7a7a472abf3dd9643fd615f6da379c4acb3e3a # test.txt v2.git/objects/3c/4e9cd789d88d8d89c c3585e41b0e614 # tree 3.git/objects/83/baae61804e65cc73a7201a c76066a30 # test.txt v1

243 .git/objects/ca/c0cab538b970a37ea1e769cbbde608743bc96d # commit 2.git/objects/d6/70460b4b4aece5915caf5c68d12f560a9fe3e4 # 'test content'.git/objects/d8/329fc1cc938780ffdd9f94e0d364e0ea74f579 # tree 1.git/objects/fa/49b ad f2a75f74e3671e92 # new.txt.git/objects/fd/f4fc3344e67ab068f836878b6c4951e3b15f3d # commit 1 irb $ irb >> content = "what is up, doc?" => "what is up, doc?" >> header = "blob #{content.length}\0" => "blob 16\000" require Digest::SHA1.hexdigest()

244 >> store = header + content => "blob 16\000what is up, doc?" >> require 'digest/sha1' => true >> sha1 = Digest::SHA1.hexdigest(store) => "bd9dbf5aae1a3862dd b20206e5fc37" Zlib::Deflate.deflate() >> require 'zlib' => true >> zlib_content = Zlib::Deflate.deflate(store) => "x\234k\312\311or04c(\317h,q\310,v(-\320qh\311o\266\a\000_\034\a\235" FileUtils.mkdir_p() File.open write() >> path = '.git/objects/' + sha1[0,2] + '/' + sha1[2,38] => ".git/objects/bd/9dbf5aae1a3862dd b20206e5fc37" >> require 'fileutils' => true >> FileUtils.mkdir_p(File.dirname(path)) => ".git/objects/bd" >> File.open(path, 'w') { f f.write zlib_content } => 32 git log 1a410e 1a410e

245 .git/ refs $ find.git/refs.git/refs.git/refs/heads.git/refs/tags $ find.git/refs -type f $ $ echo "1a410efbd13591db ebc7a059dd55cfe9" >.git/refs/heads/master $ git log --pretty=oneline master 1a410efbd13591db ebc7a059dd55cfe9 third commit cac0cab538b970a37ea1e769cbbde608743bc96d second commit fdf4fc3344e67ab068f836878b6c4951e3b15f3d first commit update-ref $ git update-ref refs/heads/master 1a410efbd13591db ebc7a059dd55cfe9 $ git update-ref refs/heads/test cac0ca $ git log --pretty=oneline test cac0cab538b970a37ea1e769cbbde608743bc96d second commit fdf4fc3344e67ab068f836878b6c4951e3b15f3d first commit

246 git branch ( 分支名称 ) update-ref git branch ( 分支名称 ) $ cat.git/head ref: refs/heads/master git checkout test $ cat.git/head ref: refs/heads/test git commit symbolicref $ git symbolic-ref HEAD refs/heads/master