先介绍点简单的

从linus那里pull,当然，前提是你先从linus那里clone一份代码树。

git pull

补充

最好不用 `git pull`,使用`git fetch` 和 `git merge`来代替它.

撤销所有在本地的修改

git checkout -f
查看你所做的修改

git commit -a
撤销最近的提交

git reset HEAD~2

5.List all changes in working dir,in diff format

`git diff`

Dispaly changes since last commit

git diff HEAD
List all changeset descriptions

git log
追踪特定文件的changesets

git log net/ieee80211/ieee80211_module.c

Branches

List all branches

git branch
Make desired branch current in working dur

git checkout $branch
Create a new branch, and make it current

git checkout -b my-new-branch master
Examine which branch is current

git status
Obtain a diff between current branch with master branch

git diff master master..HEAD
Obtain a list of changes between current branch with master branch

git log master..HEAD
A one line summary of each changes

git shortlog master..HEAD

合并分支

假设你在分支A，分支B上完成了工作，你需要把你的工作放进主分支M，

git checkout M
git merge A
git merge B

Check out an older kernel version

cd linux-source
git checkout -b tmp v2.6.22

Apply all patches in a Berkerey mbox-format file

cd linux-kernel-source
git am --utf8 --signoff /path/to/mbox

The –signoff option 暗示git am 在最后加上

Signed-off-by: Your Name <[email protected]>

The name and email are taken from the GIT_COMMITTER_NAME AND GIT_COMMITTER_EMAIL environment variables,(可以设定在.bash_profile 或者相似的文件)

download tags

git fetch --tags $URL

Tag a partical commit

cd linux-tree
git tag my-tag

转载

查看某次提交

`git show <commit Id/revsper>`

##i 查看某个版本的代码库,下面命令中的”<>”去掉

`git checkout -b <分支名> <某个版本>`

追踪特定文件的变化记录

`git log --follow <文件名>`

1.详细了解一个文件的修改过程

2.从最后提交的日期来看该代码的开发热度，对于不稳定的代码可以略读，对于稳定的代码可以详读。

追踪文件内容的变化历史

`git blame -C -L <start>,<end> <文件名>`

该命令可以小到行的__粒度__来了解代码的变化历史, -C选项可以追踪某行代码之前是位于哪个文件中的, -L选项则是选定行范围, 这样对于很大的文件, 对整个文件运行该命令可能会比较久, 指定感兴趣的行范围可以缩短时间。这两个选项都是可选的。

使用场景:

该命令会输出每一行引入的时间, 作者, commit ID, 有了这些信息, 或者用git show 命令阅读作者引入时的提交信息, 了解该改动的原因和做法; 或者, 利用这些信息, 加上lkml关键字, 用Google搜索邮件列表存档, 更深入了解当时开发者们对这一变动的所解决的问题, 解决方法的讨论。

确定某次变化是哪次提交引入的

	git bisect start HEAD <oldVersion> --no-checkout
	git bisect run sh -c 'git show BISECT_HEAD:<path that include the struct in file >
	grep -q "struct <struct name>"'

第一条命令，指定了查找的范围，–no-checkout 表示对于每一次检查，不检出当前版本库，加快检索速度。

当这两条命令运行结束后，引入变化的提交就被找到了，然后再利用git show命令查看更加详细的变化原因。

创建新分支

Create a new branch called “first-patch”, and checkout that branch by running:

git checkout -b first-patch

只能初次使用

删除一个分支

git branch -D temp

##i 查看有目前目录有多少分支

git branch

在内核中应该多建立分支,这样是工作不至于太乱

git branch -a

查看远方版本库的目前使用的分支

Update your kernel

git fetch origin

与原来的版本库标定

搜索某个人的提交

git log –author=”name”

kernel next 工作技巧

here

我摘抄过来了，当作自己的笔记： The linux-next tree is the holding area for patches aimed at the next kernel merge window. If you’re doing bleeding edge kernel development, you may want to work from that tree rather than Linus Torvalds’ mainline tree.

Initial set up

If you haven’t already done so, first clone a copy of the mainline Linux Git repository:

    $ git clone https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

	# or: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
    Cloning into 'linux'...
    ...

    Then add a remote tracking branch for linux-next:

    $ cd linux
    $ git remote add linux-next https://git.kernel.org/pub/scm/linux/ \
    kernel/git/next/linux-next.git

    # or: git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git

Fetch linux-next plus tags

    $ git fetch linux-next
    ...
    $ git fetch --tags linux-next
    ...
Regular tracking

Update linux-next:

    $ git checkout master      # to be safe
    ...
    $ git remote update
    ...
List (recent) linux-next tags:

    $ git tag -l "next-*" | tail
    next-20140612
    next-20140613
    next-20140616
    next-20140617
    next-20140618
    next-20140619
    next-20140620
    next-20140623
    next-20140624
    next-20140625

Choose the linux-next version that you will work from, and create a local branch based on that version:

$ git checkout -b my_local_branch next-20140625
Switched to a new branch 'my_local_branch'

git pull&fetch&

There are some confusseions about git remote update、git pull and git fetch. According to the link

Here:

git remote update: will update all of your branches set to track remote ones,but not merge any changes in.

git fetch: will update only the branch you’re on, but not merge any changes in.It will update other branches, if you want.Try git fetch --all

git pull: will update and merge any remote changes of the current branch you’re on . This would be the one you use to update a local branch.

git追踪linux kerenl技巧