Update git.txt

日本語サイト
Merge branch 'master' of https://github.com/7799/git_manual into Haya_branch

Conflicts:
	git.txt

	modified:   git.txt
	Haya_btanch/
	master/