githug 游戏笔记

输入 y ，创建 git_hug 目录
No githug directory found, do you wish to create one? [yn] y
Welcome to Githug!

level 1

question

Name: init
Level: 1
Difficulty: *

A new directory, git_hug, has been created; initialize an empty repository in
it.

answer

$ cd git_hug
$ git init

level 2

question

Name: config
Level: 2
Difficulty: *

Set up your git name and email, this is important so that your commits can be id
entified.

answer

$ git config [--global] user.name "[name]"
$ git config [--global] user.email "[email address]"

level 3

question

Level: 3
Difficulty: *

There is a file in your folder called README, you should add it to your staging area
Note: You start each level with a new repo. Don't look for files from the previous one.

answer

$ git add .\README

level 4

question

Name: commit
Level: 4
Difficulty: *

The README file has been added to your staging area, now commit it.

answer

$ git commit -m 'message'

level 5

question

Name: clone
Level: 5
Difficulty: *

answer

$ git clone

level 6

question

Name: clone_to_folder
Level: 6
Difficulty: *

answer

$ git clone  my_cloned_repo

level 7

question

Name: ignore
Level: 7
Difficulty: **

The text editor 'vim' creates files ending in .swp (swap files) for all files that are currently open. We don't want them creeping into the repository. Make this repository ignore those swap files which are ending in .swp.

answer

$ touch .gitignore
$ echo '*.swp'>>.gitignore

level 8

question

Name: include
Level: 8
Difficulty: **

Notice a few files with the '.a' extension. We want git to ignore all but the 'lib.a' file.

answer

$ echo '*.a'>>.gitignore
$ echo '!lib.a'>>.gitignore

level 9

question

Name: status
Level: 9
Difficulty: *

There are some files in this repository, one of the files is untracked, which file is it?

answer

$ git status

答案为：database.yml

level 10

question

Name: number_of_files_committed
Level: 10
Difficulty: *

There are some files in this repository, how many of the files will be committed?

answer

答案：2

level 11

question

Name: rm
Level: 11
Difficulty: **

A file has been removed from the working tree, however the file was not removed from the repository. Find out what this file was and remove it.

answer

$ git status
$ git rm deleteme.rb

level 12

question

Name: rm_cached
Level: 12
Difficulty: **

A file has accidentally been added to your staging area, find out which file and remove it from the staging area. NOTE Do not remove the file from the file system, only from git.

answer

$ git status
$ git rm --cached deleteme.rb

level 13

question

Name: stash
Level: 13
Difficulty: **

You've made some changes and want to work on them later. You should save them, but don't commit them.

answer

$ git stash

level 14

question

Name: rename
Level: 14
Difficulty: ***

We have a file called oldfile.txt. We want to rename it to newfile.txt and stage this change.

answer

$ git mv oldfile.txt newfile.txt

level 15

question

Name: restructure
Level: 15
Difficulty: ***

You added some files to your repository, but now realize that your project needs to be restructured. Make a new folder named src and using Git move all of the .html files into this folder.

answer

$ mkdir src
$ git mv *.html src/

level 16

question

Name: log
Level: 16
Difficulty: **

You will be asked for the hash of most recent commit. You will need to investigate the logs of the repository for this.

answer

$ git log

答案为：34b2fd7(commit后前7位)

level 17

question

Name: tag
Level: 17
Difficulty: **

We have a git repo and we want to tag the current commit with new_tag.

answer

$ git tag new_tag

level 18

question

Name: push_tags
Level: 18
Difficulty: **

There are tags in the repository that aren't pushed into remote repository. Push them now.

answer

$ git push --tags

level 19

question

Name: commit_amend
Level: 19
Difficulty: **

The README file has been committed, but it looks like the file forgotten_file.rb was missing from the commit. Add the file and amend your previous commit to include it.

answer

$ git add forgotten_file.rb
$ git commit --amend -m 'message'

level 20

question

Name: commit_in_future
Level: 20
Difficulty: **

Commit your changes with the future date (e.g. tomorrow).

answer

$ git commit --date 2016.10.08 -m 'message'

level 21

question

Name: reset
Level: 21
Difficulty: **

There are two files to be committed. The goal was to add each file as a separate commit, however both were added by accident. Unstage the file to_commit_second.rb using the reset command (don't commit anything).

answer

$ git status
$ git reset HEAD to_commit_second.rb

level 22

question

Name: reset_soft
Level: 22
Difficulty: **

You committed too soon. Now you want to undo the last commit, while keeping the index.

answer

$ git reset --soft HEAD^

level 23

question

Name: checkout_file
Level: 23
Difficulty: ***

A file has been modified, but you don't want to keep the modification. Checkout the config.rb file from the last commit.

answer

$ git checkout config.rb

level 24

question

Name: remote
Level: 24
Difficulty: **

This project has a remote repository. Identify it.

answer

$ git remote -v

答案：my_remote_repo

level 25

question

Name: remote_url
Level: 25
Difficulty: **

The remote repositories have a url associated to them. Please enter the url of remote_location.

answer

$ git remote -v

level 26

question

Name: pull
Level: 26
Difficulty: **

You need to pull changes from your origin repository.

answer

$ git pull origin master

level 27

question

Name: remote_add
Level: 27
Difficulty: **

answer

$ git remote add origin

level 28

question

Name: push
Level: 28
Difficulty: ***

Your local master branch has diverged from the remote origin/master branch. Rebase your commit onto origin/master and push it to remote.

answer

$ git rebase origin/master
$ git push origin master

level 29

question

Name: diff
Level: 29
Difficulty: **

There have been modifications to the app.rb file since your last commit. Find out which line has changed.

answer

$ git diff app.rb

答案：26

level 30

question

Name: blame
Level: 30
Difficulty: **

Someone has put a password inside the file config.rb find out who it was.

answer

$ git blame config.rb

答案：Spider Man

level 31

question

Name: branch
Level: 31
Difficulty: *

You want to work on a piece of code that has the potential to break things, create the branch test_code.

answer

$ git branch test_code

level 32

question

Name: checkout
Level: 32
Difficulty: **

Create and switch to a new branch called my_branch. You will need to create a branch like you did in the previous level.

answer

$ git checkout -b my_branch

level 33

question

Name: checkout_tag
Level: 33
Difficulty: **

You need to fix a bug in the version 1.2 of your app. Checkout the tag v1.2.

answer

$ git checkout v1.2

level 34

question

Name: checkout_tag_over_branch
Level: 34
Difficulty: **

You need to fix a bug in the version 1.2 of your app. Checkout the tag v1.2 (Note: There is also a branch named v1.2).

answer

$ git checkout tags/v1.2

level 35

question

Name: branch_at
Level: 35
Difficulty: ***

You forgot to branch at the previous commit and made a commit on top of it. Create branch test_branch at the commit before the last.

answer

一种方法：

$ git branch test_branch HEAD^1

第二种方法：

$ git log
$ git branch test_branch -v 00740b4

找到第二条的id，输入前7位

level 36

question

Name: delete_branch
Level: 36
Difficulty: **

You have created too many branches for your project. There is an old branch in your repo called 'delete_me', you should delete it.

answer

$ git branch -d delete_me

level 37

question

Name: push_branch
Level: 37
Difficulty: **

You've made some changes to a local branch and want to share it, but aren't yet ready to merge it with the 'master' branch. Push only 'test_branch' to the remote repository

answer

$ git push origin test_branch

level 38

question

Name: merge
Level: 38
Difficulty: **

We have a file in the branch 'feature'; Let's merge it to the master branch.

answer

$ git merge feature

level 39

question

Name: fetch
Level: 39
Difficulty: **

Looks like a new branch was pushed into our remote repository. Get the changes without merging them with the local repository

answer

$ git fetch origin

level 40

question

Name: rebase
Level: 40
Difficulty: **

We are using a git rebase workflow and the feature branch is ready to go into master. Let's rebase the feature branch onto our master branch.

answer

$ git checkout feature
$ git rebase master

level 41

question

Name: rebase_onto
Level: 41
Difficulty: **

You have created your branch from wrong_branch and already made some commits, and you realise that you needed to create your branch from master. Rebase your commits onto master branch so that you don't have wrong_branch commits.

answer

$ git rebase --onto master wrong_branch

level 42

question

Name: repack
Level: 42
Difficulty: **

Optimise how your repository is packaged ensuring that redundant packs are removed.

answer

$ git repack -d

level 43

question

Name: cherry-pick
Level: 43
Difficulty: ***

Your new feature isn't worth the time and you're going to delete it. But it has one commit that fills in README file, and you want this commit to be on the master as well.

answer

$ git branch
$ git log new-feature
$ git cherry-pick ca32a6da

先查看分支列表，得到分支名，查看分支提交记录，最后合并。

level 44

question

Name: grep
Level: 44
Difficulty: **

Your project's deadline approaches, you should evaluate how many TODOs are left in your code

answer

$ git grep TODO

可以看到有四条

level 45

question

Name: rename_commit
Level: 45
Difficulty: ***

Correct the typo in the message of your first (non-root) commit.

answer

$ git log master
$ git rebase -i HEAD~2

查看历史提交记录，看到需要修改的为倒数第二个，进入编辑页面，将需要改动的行的pick改为reword。保存退出后在弹出的第二个窗口里修改拼写错误 commmit 改为 commit

level 46

question

Name: squash
Level: 46
Difficulty: ****

You have committed several times but would like all those changes to be one commit.

answer

$ git rebase -i HEAD~4

将后三个改为s

level 47

question

Name: merge_squash
Level: 47
Difficulty: ***

Merge all commits from the long-feature-branch as a single commit.

answer

$ git merge --squash long-feature-branch
$ git commit -m 'message'

level 48

question

Name: reorder
Level: 48
Difficulty: ****

You have committed several times but in the wrong order. Please reorder your commits.

answer

$ git log
$ git rebase -i HEAD~2

查看历史记录发现提交顺序错误，将前两行顺序调换。

level 49

question

Name: bisect
Level: 49
Difficulty: ***

A bug was introduced somewhere along the way. You know that running ruby prog.rb 5 should output 15. You can also run make test. What are the first 7 chars of the hash of the commit that introduced the bug.

answer

$ git log --reverse -p prog.rb
$ git bisect start master f6088248
$ git bisect run make test

查看最初一次为正确提交，得到版本号。执行完毕后日志里找到 “is the first bad commit” ,得到 18ed2ac。
（标记）：出错了得到的结果不为这个。。。

level49

level 50

question

Name: stage_lines
Level: 50
Difficulty: ****

You've made changes within a single file that belong to two different features, but neither of the changes are yet staged. Stage only the changes belonging to the first feature.

answer

$ git add -p feature.rb

输入e编辑提交内容，删除第二个。

level 51

question

Name: find_old_branch
Level: 51
Difficulty: ****

You have been working on a branch but got distracted by a major issue and forgot the name of it. Switch back to that branch.

answer

$ git reflog
$ git checkout solve_world_hunger

查找到另一个分支，切换到另一个分支。

level 52

question

Name: revert
Level: 52
Difficulty: ****

You have committed several times but want to undo the middle commit.
All commits have been pushed, so you can't change existing history.

answer

$ git log
$ git revert HEAD^1

level 53

question

Name: restore
Level: 53
Difficulty: ****

You decided to delete your latest commit by running git reset --hard HEAD^. (Not a smart thing to do.) You then change your mind, and want that commit back. Restore the deleted commit.

answer

$ git reflog
$ git checkout bdbe33d

查看日志，回覆至对应的版本

level 54

question

Name: conflict
Level: 54
Difficulty: ****

You need to merge mybranch into the current branch (master). But there may be some incorrect changes in mybranch which may cause conflicts. Solve any merge-conflicts you come across and finish the merge.

answer

$ git merge mybranch
$ vim poem.txt
$ git add poem.txt
$ git commit -m 'message'

level 55

question

Name: submodule
Level: 55
Difficulty: **

answer

$ git submodule add

githug 游戏笔记

level 1

question

answer

相关

level 2

question

answer

相关

level 3

question

answer

相关

level 4

question

answer

相关

level 5

question

answer

相关

level 6

question

answer

相关

level 7

question

answer

相关

level 8

question

answer

相关

level 9

question

answer

相关

level 10

question

answer

相关

level 11

question

answer

相关

level 12

question

answer

相关

level 13

question

answer

相关

level 14

question

answer

相关

level 15

question

answer

相关

level 16

question

answer

相关

level 17

question

answer

相关

level 18

question

answer

相关

level 19

question

answer

相关

level 20

question

answer