git常用命令备忘

1。 查看当前版本

[root@CloudGame gatling]# git --version
git version 2.6.0-rc1

2。查看git的配置信息，（若在当前git本地仓库里，包含当前项目的信息）

[root@CloudGame gatling]# git config -l
user.name=chengsh
user.email=shihu.cheng@xxxx.com
push.default=simple
core.repositoryformatversion=0
core.filemode=true
core.bare=false
core.logallrefupdates=true
remote.origin.url=https://github.com/gatling/gatling
remote.origin.fetch=+refs/heads/*:refs/remotes/origin/*
branch.2.1.X.remote=origin
branch.2.1.X.merge=refs/heads/2.1.X

这里，提供一个简单的常用的获取帮助的指令，git help,查看git的帮助信息，另一个更为重要的指令是git help <command>，查看指定的command的帮助信息。

下面是git help的信息：

[root@CloudGame mrepos]# git help
usage: git [--version] [--help] [-C <path>] [-c name=value]
           [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]
           [-p | --paginate | --no-pager] [--no-replace-objects] [--bare]
           [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]
           <command> [<args>]

These are common Git commands used in various situations:

start a working area (see also: git help tutorial)
   clone      Clone a repository into a new directory
   init       Create an empty Git repository or reinitialize an existing one

work on the current change (see also: git help everyday)
   add        Add file contents to the index
   mv         Move or rename a file, a directory, or a symlink
   reset      Reset current HEAD to the specified state
   rm         Remove files from the working tree and from the index

examine the history and state (see also: git help revisions)
   bisect     Use binary search to find the commit that introduced a bug
   grep       Print lines matching a pattern
   log        Show commit logs
   show       Show various types of objects
   status     Show the working tree status

grow, mark and tweak your common history
   branch     List, create, or delete branches
   checkout   Switch branches or restore working tree files
   commit     Record changes to the repository
   diff       Show changes between commits, commit and working tree, etc
   merge      Join two or more development histories together
   rebase     Forward-port local commits to the updated upstream head
   tag        Create, list, delete or verify a tag object signed with GPG

collaborate (see also: git help workflows)
   fetch      Download objects and refs from another repository
   pull       Fetch from and integrate with another repository or a local branch
   push       Update remote refs along with associated objects

下面是git help clone的信息，你也可以查看其他的command，例如branch，add等等。。。

GIT-CLONE(1)                      Git Manual                      GIT-CLONE(1)

NAME
       git-clone - Clone a repository into a new directory

SYNOPSIS
       git clone [--template=<template_directory>]
                 [-l] [-s] [--no-hardlinks] [-q] [-n] [--bare] [--mirror]
                 [-o <name>] [-b <name>] [-u <upload-pack>] [--reference <repository>]
                 [--depth <depth>] [--recursive] [--] <repository> [<directory>]

DESCRIPTION
       Clones a repository into a newly created directory, creates remote-tracking branches for each branch in the cloned
       repository (visible using git branch -r), and creates and checks out an initial branch that is forked from the cloned
       repository’s currently active branch.

       After the clone, a plain git fetch without arguments will update all the remote-tracking branches, and a git pull
       without arguments will in addition merge the remote master branch into the current master branch, if any.

       This default configuration is achieved by creating references to the remote branch heads under refs/remotes/origin and
       by initializing remote.origin.url and remote.origin.fetch configuration variables.

OPTIONS
       --local, -l
           When the repository to clone from is on a local machine, this flag bypasses the normal "git aware" transport
           mechanism and clones the repository by making a copy of HEAD and everything under objects and refs directories. The
           files under .git/objects/ directory are hardlinked to save space when possible. This is now the default when the
           source repository is specified with /path/to/repo syntax, so it essentially is a no-op option. To force copying
           instead of hardlinking (which may be desirable if you are trying to make a back-up of your repository), but still
           avoid the usual "git aware" transport mechanism, --no-hardlinks can be used.

       --no-hardlinks
           Optimize the cloning process from a repository on a local filesystem by copying files under .git/objects directory.

       --shared, -s
           When the repository to clone is on the local machine, instead of using hard links, automatically setup
           .git/objects/info/alternates to share the objects with the source repository. The resulting repository starts out
           without any object of its own.
..............................

3. 克隆远程指定版本的分支到本地（例如，从github上clone版本为2.1.X分支的源码到本地）git clone url [-b <branch name>]

[root@CloudGame gatling217]# git clone https://github.com/gatling/gatling -b 2.1.X
Cloning into 'gatling'...
remote: Counting objects: 116304, done.
remote: Compressing objects: 100% (1808/1808), done.
remote: Total 116304 (delta 844), reused 5 (delta 5), pack-reused 113985
Receiving objects: 100% (116304/116304), 27.23 MiB | 3.53 MiB/s, done.
Resolving deltas: 100% (37493/37493), done.
Checking connectivity... done.

其中，git clone指令，也有很多其他的用法，较常用的就是克隆远程分支到本地指定的路径，git clone url [<local dir>],这里的local dir会自动创建出来，不用事先创建

[root@CloudGame gatling217]# git clone https://github.com/gatling/gatling gatlingMaster
Cloning into 'gatlingMaster'...
remote: Counting objects: 116304, done.
remote: Compressing objects: 100% (1808/1808), done.
remote: Total 116304 (delta 844), reused 5 (delta 5), pack-reused 113985
Receiving objects: 100% (116304/116304), 27.23 MiB | 2.78 MiB/s, done.
Resolving deltas: 100% (37493/37493), done.
Checking connectivity... done.

4. 查看当前项目所在的分支（本地信息） git branch

[root@CloudGame autoscale]# git branch
* autoscale
  master

5. 查看当前项目的本地/远程仓库所有的分支信息git branch -a

[root@CloudGame ngrinder]# git branch -a
* autoscale-preventfix
  remotes/origin/HEAD -> origin/master
  remotes/origin/add_sticky_copyright
  remotes/origin/agent_download
  remotes/origin/allow_user_registration
  remotes/origin/autoagent
  remotes/origin/autoscale
  remotes/origin/autoscale-preventfix
  remotes/origin/b38
  remotes/origin/bootstrap-3-trial
  remotes/origin/compact_page_with_macro
  remotes/origin/gh-pages
  remotes/origin/improve_naming
  remotes/origin/issue-58
  remotes/origin/jdk8-support
  remotes/origin/make_unit_test_work
  remotes/origin/master
  remotes/origin/monitor_plugin_extention
  remotes/origin/ngrinder_3.0
  remotes/origin/ngrinder_3.1
  remotes/origin/ngrinder_3.1_feature_demo
  remotes/origin/release_3.3
  remotes/origin/speedy_user_switch

其中，git branch指令还有一些其他的option，都是很重要的，比较常用的，比如创建分支，删除分支，改名等等，如下面的帮助列表：

　　　　-d
           Delete a branch. The branch must be fully merged in its upstream branch, or in HEAD if no upstream was set with
           --track or --set-upstream.

       -D
           Delete a branch irrespective of its merged status.

       -l
           Create the branch’s reflog. This activates recording of all changes made to the branch ref, enabling use of date
           based sha1 expressions such as "<branchname>@{yesterday}". Note that in non-bare repositories, reflogs are usually
           enabled by default by the core.logallrefupdates config option.

       -f, --force
           Reset <branchname> to <startpoint> if <branchname> exists already. Without -f git branch refuses to change an
           existing branch.

       -m
           Move/rename a branch and the corresponding reflog.

       -M
           Move/rename a branch even if the new branch name already exists.

       --color[=<when>]
           Color branches to highlight current, local, and remote branches. The value must be always (the default), never, or
           auto.

       --no-color
           Turn off branch colors, even when the configuration file gives the default to color output. Same as --color=never.

       -r
           List or delete (if used with -d) the remote-tracking branches.

       -a
           List both remote-tracking branches and local branches.

       -v, --verbose
           Show sha1 and commit subject line for each head, along with relationship to upstream branch (if any). If given
           twice, print the name of the upstream branch, as well.

6. 创建一个远程仓库，并做一些常见的操作。

[root@CloudGame tmp]# mkdir mrepos　　　　　　//A. 创建本地仓库目录
[root@CloudGame tmp]# cd mrepos/
[root@CloudGame mrepos]# ll
total 0
[root@CloudGame mrepos]# git init　　　　　　//B。 初始化本地仓库
Initialized empty Git repository in /mnt/tmp/mrepos/.git/
[root@CloudGame mrepos]# ll
total 0
[root@CloudGame mrepos]# ll -al
total 12
drwxr-xr-x 3 root root 4096 Jan 11 08:58 .
drwxr-xr-x 4 root root 4096 Jan 11 08:58 ..
drwxr-xr-x 7 root root 4096 Jan 11 08:58 .git
[root@CloudGame mrepos]# vim README.txt　　//C。 在本地编辑一个文件，用于后面的操作
[root@CloudGame mrepos]# 
[root@CloudGame mrepos]# 
[root@CloudGame mrepos]# git status　　　　//D。查看当前分支的状态信息
On branch master

Initial commit

Untracked files:
  (use "git add <file>..." to include in what will be committed)

    README.txt

nothing added to commit but untracked files present (use "git add" to track)

接下来，将文件添加到本地仓库并commit，为后续提交做准备。

[root@CloudGame mrepos]# git add README.txt 　　　　//E。 将文件添加到index，就是为commit准备
[root@CloudGame mrepos]# git status　　　　　　　　　　//F。 再次查看当前分支的状态
On branch master

Initial commit

Changes to be committed:
  (use "git rm --cached <file>..." to unstage)

    new file:   README.txt

[root@CloudGame mrepos]# git commit -m "First commit in demo about create remote repos"　　　　//G。 将当前的改变记录到仓库
[master (root-commit) 231d9dc] First commit in demo about create remote repos
 1 file changed, 1 insertion(+)
 create mode 100644 README.txt

现在，将本地仓库添加为远程仓库，这个，我觉得在很多单位或者团队开发过程中都会用到，实现版本集中管理，多地开发。

[root@CloudGame mrepos]# git remote add origin ssh://root@109.105.5.108/mnt/tmp/mrepos　　　　//H。 添加本地仓库到远程仓库
[root@CloudGame mrepos]# git push origin master　　　　　　　　　　　　　　　　　　　　　　　　　　　//I。更新远程仓库origin的refspec为master的refs
root@109.105.5.108's password: 
Everything up-to-date
[root@CloudGame mrepos]# git remote show origin　　　　　　　　　　　　　　　　　　//J. 查看远程仓库origin的信息
root@109.105.5.108's password: 
* remote origin
  Fetch URL: ssh://root@109.105.5.108/mnt/tmp/mrepos
  Push  URL: ssh://root@109.105.5.108/mnt/tmp/mrepos
  HEAD branch: master
  Remote branch:
    master tracked
  Local ref configured for 'git push':
    master pushes to master (up to date)

这里，有个很重要的地方就是git remote add命令参数，本例子中，origin是仓库的名字，你也可以取你自己的名字，但是通常将远程仓库的名字取名为origin。再就是后面跟着的URL,这个是要供给其他人访问的。所以，地址一定要是个绝对地址，尤其是后面的路径。

觉得origin仓库名不好或者不需要了，可以执行git remote rm origin进行删除。这里是删除远程的仓库哟。本地仓库删除，可以直接删除目录即可。

这里，要注意的还有，上述的URL中，其格式可以是很多种（），如下：

GIT URLS
       In general, URLs contain information about the transport protocol, the address of the remote server, and the path to
       the repository. Depending on the transport protocol, some of this information may be absent.

       Git natively supports ssh, git, http, https, ftp, ftps, and rsync protocols. The following syntaxes may be used with
       them:

       ·   ssh://[user@]host.xz[:port]/path/to/repo.git/

       ·   git://host.xz[:port]/path/to/repo.git/

       ·   http[s]://host.xz[:port]/path/to/repo.git/

       ·   ftp[s]://host.xz[:port]/path/to/repo.git/

       ·   rsync://host.xz/path/to/repo.git/

       An alternative scp-like syntax may also be used with the ssh protocol:

       ·   [user@]host.xz:path/to/repo.git/

       The ssh and git protocols additionally support ~username expansion:

       ·   ssh://[user@]host.xz[:port]/~[user]/path/to/repo.git/

       ·   git://host.xz[:port]/~[user]/path/to/repo.git/

       ·   [user@]host.xz:/~[user]/path/to/repo.git/

       For local respositories, also supported by git natively, the following syntaxes may be used:

       ·   /path/to/repo.git/

       ·    file:///path/to/repo.git/

现在来测试一下，这个库创建的是否可用（，可以在自己本地的另外一个终端测试，也可以在另外一台机器上测试，我都测试过，都没有问题）：

[root@CloudGame mytool]# git clone ssh://root@109.105.5.108/mnt/tmp/mrepos
Cloning into 'mrepos'...
root@109.105.5.108's password: 
remote: Counting objects: 3, done.
remote: Total 3 (delta 0), reused 0 (delta 0)
Receiving objects: 100% (3/3), done.
Checking connectivity... done.

7. 创建并提交分支

[root@CloudGame mrepos]# git checkout -b firstbranch
Switched to a new branch 'firstbranch'
[root@CloudGame mrepos]# git branch
* firstbranch
  master

现在创建一个文件并做提交到远程仓库：

[root@CloudGame mrepos]# vim firstfile.txt
[root@CloudGame mrepos]# git add .
[root@CloudGame mrepos]# git commit -m "first file"
[firstbranch a283ff2] first file
 1 file changed, 1 insertion(+)
 create mode 100644 firstfile.txt
[root@CloudGame mrepos]# git push
fatal: The current branch firstbranch has no upstream branch.
To push the current branch and set the remote as upstream, use

    git push --set-upstream origin firstbranch

[root@CloudGame mrepos]# git push--set-upstream origin firstbranch
git: 'push--set-upstream' is not a git command. See 'git --help'.
[root@CloudGame mrepos]# git push --set-upstream origin firstbranch
root@109.105.5.108's password: 
Branch firstbranch set up to track remote branch firstbranch from origin.
Everything up-to-date
[root@CloudGame mrepos]# git status
On branch firstbranch
Your branch is up-to-date with 'origin/firstbranch'.
nothing to commit, working directory clean

通过图形化界面可以看看，创建的分支基本信息：

现在再在另外一个窗口或者另外一个机器上进行clone刚提交的内容，并做分支切换，检测是否正确：

[root@CloudGame mrepos]# ll
total 8
-rw-r--r-- 1 root root 20 Jan 11 10:28 firstfile.txt
-rw-r--r-- 1 root root 12 Jan 11 10:28 README.txt
[root@CloudGame mrepos]# git branch　　　　　　//查看当前所在的分支
* firstbranch
[root@CloudGame mrepos]# git checkout master　　//切换到master分支上
Branch master set up to track remote branch master from origin.
Switched to a new branch 'master'
[root@CloudGame mrepos]# ll
total 4
-rw-r--r-- 1 root root 12 Jan 11 10:28 README.txt
[root@CloudGame mrepos]# 

最后，再介绍一个从指定分支的指定commit点拉分支的操作。这个还是非常有用的。首先在本地的firstbranch分支下创建一个文件secondfile.txt，并push到远程仓库。这个和创建firstfile.txt一样。不列出操作，主要看看在另一个窗口/另外一个机器上pull这个文件的操作，因为前面没有提到如何从远程仓库的某个分支上取文件。看下面的信息：

[root@CloudGame mrepos]# git checkout firstbranch　　　　//切换到firstbranch
Switched to branch 'firstbranch'
Your branch is up-to-date with 'origin/firstbranch'.
[root@CloudGame mrepos]# ll　　　　　　　　　　　　　　　　　//目前没有看到刚才提交的secondfile.txt
total 8
-rw-r--r-- 1 root root 20 Jan 11 10:41 firstfile.txt
-rw-r--r-- 1 root root 12 Jan 11 10:28 README.txt
[root@CloudGame mrepos]# git pull　　　　　　　　　　　　　　//pull一下，就可以将远程仓库的内容更新下来
root@109.105.5.108's password: 
remote: Counting objects: 3, done.
remote: Compressing objects: 100% (2/2), done.
remote: Total 3 (delta 0), reused 0 (delta 0)
Unpacking objects: 100% (3/3), done.
From ssh://109.105.5.108/mnt/tmp/mrepos
   a283ff2..fc6f513  firstbranch -> origin/firstbranch
Updating a283ff2..fc6f513
Fast-forward
 secondfile.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 secondfile.txt
[root@CloudGame mrepos]# ll　　　　　　　　　　　　　　　　　//现在是不是看到了secondfile.txt了
total 12
-rw-r--r-- 1 root root 20 Jan 11 10:41 firstfile.txt
-rw-r--r-- 1 root root 12 Jan 11 10:28 README.txt
-rw-r--r-- 1 root root 21 Jan 11 10:41 secondfile.txt

在此，我就基于firstfile.txt文件提交的commit点，在另外一个终端创建一个新的分支secondbranch。注意，这里的commit点如何获取呢，请看上面的图形化界面截图中的SHA1 ID后面的字符串，那个就是你要的startpoint的标记，或者说是svn/clearcase等里面的label。

没有创建分支时，看看远程版本树上的分支信息：

创建此类分支的指令和操作过程如下：

[root@CloudGame mrepos]# git branch
* firstbranch
  master
[root@CloudGame mrepos]# git checkout -b secondbranch a283ff298dbff855b7e2cca60f8a5c25d0cca5f2　　　　
Switched to a new branch 'secondbranch'
[root@CloudGame mrepos]# git branch
  firstbranch
  master
* secondbranch
[root@CloudGame mrepos]# ll
total 8
-rw-r--r-- 1 root root 20 Jan 11 10:41 firstfile.txt
-rw-r--r-- 1 root root 12 Jan 11 10:28 README.txt

是不是发现，secondfile.txt不见了，对，这个就是版本管理中的视图管理，因为当前的分支节点上一了一个commit。然后创建一个文件并提交到远程仓库：

[root@CloudGame mrepos]# git push --set-upstream origin secondbranch
root@109.105.5.108's password: 
Counting objects: 3, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (2/2), done.
Writing objects: 100% (3/3), 330 bytes | 0 bytes/s, done.
Total 3 (delta 0), reused 0 (delta 0)
To ssh://root@109.105.5.108/mnt/tmp/mrepos
 * [new branch]      secondbranch -> secondbranch
Branch secondbranch set up to track remote branch secondbranch from origin.

再通过gitk命令看看图形化界面的内容，你会发现多了一个分支secondbranch。

8. 如何删除一个分支呢

 下面还是通过操作说明，就将前面创建的firstbranch删除吧，删除本地，还要删除远程的。

[root@CloudGame mrepos]# git branch -a　　　　　　//注意，git是不让你删除当前所在的branch的
* firstbranch
  master
  remotes/origin/HEAD -> origin/firstbranch
  remotes/origin/firstbranch
  remotes/origin/master
[root@CloudGame mrepos]# git checkout master
Switched to branch 'master'
Your branch is up-to-date with 'origin/master'.
[root@CloudGame mrepos]# 
[root@CloudGame mrepos]# 
[root@CloudGame mrepos]# git branch -D firstbranch　　　　//删除本地的分支
Deleted branch firstbranch (was 26e41de).
[root@CloudGame mrepos]# git branch -r -d origin/firstbranch　　　　//删除远程仓库中的分支
Deleted remote-tracking branch origin/firstbranch (was 26e41de).
[root@CloudGame mrepos]# git push origin :firstbranch　　　　　　　　//将删除的内容提交到远程仓库，注意，冒号前面的空格不能忘记了哟，否则会出错的
root@109.105.5.108's password: 
remote: error: refusing to update checked out branch: refs/heads/firstbranch
remote: error: By default, updating the current branch in a non-bare repository
remote: error: is denied, because it will make the index and work tree inconsistent
remote: error: with what you pushed, and will require 'git reset --hard' to match
remote: error: the work tree to HEAD.
remote: error: 
remote: error: You can set 'receive.denyCurrentBranch' configuration variable to
remote: error: 'ignore' or 'warn' in the remote repository to allow pushing into
remote: error: its current branch; however, this is not recommended unless you
remote: error: arranged to update its work tree to match what you pushed in some
remote: error: other way.
remote: error: 
remote: error: To squelch this message and still keep the default behaviour, set
remote: error: 'receive.denyCurrentBranch' configuration variable to 'refuse'.
To ssh://root@109.105.5.108/mnt/tmp/mrepos
 ! [remote rejected] firstbranch (branch is currently checked out)
error: failed to push some refs to 'ssh://root@109.105.5.108/mnt/tmp/mrepos'
[root@CloudGame mrepos]# 
[root@CloudGame mrepos]# git push origin :firstbranch　　//上面的错误信息是说，要删除的分支目前出于checkout的状态，不许删除，只能删除远程中非checkout状态的分支
root@109.105.5.108's password: 
To ssh://root@109.105.5.108/mnt/tmp/mrepos
 - [deleted]         firstbranch

到此，是不是基本的常用的日常工作中用到的git操作，在这里都涉及到了，希望对博友有所帮助，对我也是一个备忘记录吧。