Update 20160403 #111
Open
Update 20160403 #111
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Although Vim uses files that end with '~', usually 'git status' shows '.*.swp' file that is present during editing a file (~ file is present only at saving time)
I think it is better to warn reader that commit/tag hashes in 10th chapter are different from what he/she will get. Other hashes (of blobs and trees) are identical so reader can think that he has done something wrong
* We need 'git checkout master' because we've left on 'test' branch in previous section * I was surprised that before gc we had only 22K objects, because we have two copies of 22K files. So I checked it and it appears that because of compression each of them takes only 7K place on disk. Also before compression all objects take 15K if summing them up (not 22K).
--detach will fork and trigger an endless loop of respawns If --detach is used you probably want to specify expect fork[1] [1] http://upstart.ubuntu.com/cookbook/#expect-fork
Remove --detach from local-git-daemon.conf
Fix issue #531: git pull is for current branch
Use 'half' instead of '½'
…sections. There is no `git add remote`, related command, or statement in previous sections, but `git clone`. And the only remote repository mentioned is "origin" which is added implicitly via clone command. Fix the sentence for that.
Also fix "remote branch" to "remote-tracking branch".
Fix issue #526: There is no *adding* remote repositories in previous sections.
Fix issue #534: `git remote rename` does not rename *a* reference
…nfuses the newbie
…king branch by a single git pull command at once The merge feature of git pull only works on current branch.
Fix issue #530: Explaining `fetch` command via the word "pull" may confuses the newbie
Fix issue #533: Not all local branches can merge with its remote-tracking branch by a single git pull command at once
git-credential-read-only should match against username
Fix cmdline in credentials.asc
Extracting image from "progit2\book\cover.png", then using that extracted image to make "Pro.ico" by using http://converticon.com/. File ".tgitconfig" is copied from TortoiseGit repository and modified for this repository.
Fix issue #541: Add TortoiseGit config for bugtraq and icon
Fix issue #551: Missing backtick(`)
Add note that it is not recommended to use --no-metadata because it may breaks synchronisation between git and svn.
Updated the note due to the argumentation of progit/progit2#555 (comment) So the comment is less radical and fits better into the context of a migration from svn to git.
…ream vs. downstream)
Add recommendation note
Fix issue #554: The output of 'git status' is out-of-date
Fix issue #448: 3.2 Git Branching -- possibly wrong explanation (upstream vs. downstream)
Fix issue #557: Not precise statement for those two columns of `git status -s`
Fix issue #312: /srv/git instead of /opt/git for server repositories
…ing..., subsec. Private small team
Use "version 2.x of Git for Windows"
Make it bundle on OS X with Ruby 2.3 from brew.
Fix issue #502: Doubled explanation in one paragraph of 5.2 Contributing..., subsec. Private small team
Fix issue #384: There's no Git for Windows 2.x
Update json to 1.8.3 and resolve issue #573
Fix issue #553: Git does the checkout while cloning, not "you".
Fix issue #579: Need autotools for installing git from source
Fix issue #577: One command is `git mv`, instead of `mv`.
|
/cc @harupong |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
現在の翻訳内容は最新の原書の約4年分の変更が取り込めていないようでした。
一気に追いつくのはちょっと大変そうでしたので、2016年4月3日時点の progit/progit2@e95aba0 までマージして、それに合わせて翻訳も更新しました。原書では次の変更は2016年8月5日の progit/progit2@e96bfdc と少し更新が止まっていたタイミングのようでしたので、ここをいったん選びました。
最新の原書ではさらに内容が変わっている箇所がある可能性はありますが、変更を順に追って追いついた方が確認しやすいと思い、意図的にこの時点での翻訳としています。