Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
@zfben
zfben committed Aug 29, 2016
1 parent 92f85a0 commit bc0f207
Show file tree
Hide file tree
Showing 35 changed files with 149 additions and 58 deletions.
40 changes: 16 additions & 24 deletions .middleman/source/2016-08-25.html.markdown
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
---
title: 常用有用的Git Tips
title: 常用有用的 Git Tips
date: 2016-08-25
tags: git
tags: Git
author: fengd
summary: Git除了add, commit, push, 其实还有好多有用有意思的方法
summary: Git 除了 add, commit, push, 其实还有好多有用有意思的方法
---

##用好Git Log
### 用好Git Log

你应该用过 git log, 但是 log 支持很多有用的参数也许你不知道，下面列出一些比较有用的

Expand All @@ -22,25 +22,21 @@ summary: Git除了add, commit, push, 其实还有好多有用有意思的方法

git log --author="jack" --after="1 week ago" -- oneline


##查看还没有合并到Master/父分之中的改动
### 查看还没有合并到Master/父分之中的改动

git log --no-merges masters..


##从另一个分支中获取文件
### 从另一个分支中获取文件

先看另一个分支的某个文件，其实可以不用切换到那个分支，执行下面的命令就可以直接查看

git show some-branch:somefile.js


如果你想和某个分支上的版本进行对比

git diff some-branch some-file.js


##关于 rebasing
### 关于 rebasing

Rebase其实比较复杂，单独写一篇文章都未必讲的清楚明白, 当时有一个很实用的技巧不得不提

Expand All @@ -53,7 +49,7 @@ Rebase其实比较复杂，单独写一篇文章都未必讲的清楚明白, 当

这时rebase就是更好的选择，`git pull --rebase`, git 会先从remote获取最新的代码，然后在push本地的改动，不会有merge产生.

##修改上一个Commit
### 修改上一个 Commit

发现刚刚提交的Commit有一个Typo或者其它很小的改动，Well，当然可以提交个新的Commit， 然后log写上 “fix typo”.

Expand All @@ -64,41 +60,37 @@ Rebase其实比较复杂，单独写一篇文章都未必讲的清楚明白, 当
3. 执行 `git commit --amend` 这会把这一次的改动提交到上一个Commit中
4. Push

##Git的三个状态，三个状态之间如何切换
### Git的三个状态，三个状态之间如何切换

__三个状态：__
#### 三个状态：

1. 没有Staged, 没有执行`git add`
2. Staged, 当时没有Commit的， 执行了 `git add` , 当时没有执行 `git commit`
3. Commit的, 执行了 `git commit`

用 `git status` 可以查看处在1， 2状态的文件

__如何在三个状态之间切换__
#### 如何在三个状态之间切换

1. `git reset --head {{some-commit-hash}}` 返回到某一个Commit， 所有这个commit之后的改动都丢弃
2. `git reset {{some-commit-hash}}` 返回到某一个commit，所有这个commit之后的改动都归到状态1， 没有staged，
3. `git reset --soft {{some-commit-hash}}` 返回到某一个commit， 这个commit之后的改动都归到状态2
2. `git reset {{some-commit-hash}}` 返回到某一个commit，所有这个commit之后的改动都归到状态1， 没有staged，
3. `git reset --soft {{some-commit-hash}}` 返回到某一个commit， 这个commit之后的改动都归到状态2


最常用的一个可能是第一个, 放弃本地所有的改动

git reset --hard HEAD


##Revert Commit
### Revert Commit

git revert -n

取消之前的Commit

取消之前的Commit

##为常用的git命令设置别名
### 为常用的git命令设置别名

git l = git log --online --grath


等等等等


来自文章 [Top 19 Tips For everyday git use](http://www.alexkras.com/19-git-tips-for-everyday-use/)
2 changes: 1 addition & 1 deletion 2014-07-23.html
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!DOCTYPE html><html lang="zh-CN"><head><meta content="IE=edge;chrome=1" http-equiv="X-UA-Compatible" /><meta content="width=device-width, initial-scale=1" name="viewport" /><title>Rails遗留程序里最常犯的错误(译) · 简单心理技术团队</title><link href="/stylesheets/app.css" rel="stylesheet" /><link rel="alternate" type="application/atom+xml" title="Atom Feed" href="/feed.xml" /><link href="/images/favicon.ico" rel="icon" /></head><body><div class="animated fadeInDown"><div class="header container"><a class="logo" href="/"><img src="/images/logo.png" alt="Logo" /></a><h1><a href="/">简单心理 · 技术团队</a></h1><a class="github" href="https://github.com/jiandanxinli">github.com/jiandanxinli</a></div><div class="subheader container"><a href="/tags/ruby.html" class="active">Ruby</a><a href="/tags/web.html">Web</a><a href="/tags/api.html">API</a><a href="/tags/ubuntu.html">Ubuntu</a><a href="/tags/nginx.html">Nginx</a><a href="/tags/ipv6.html">IPv6</a><a href="/tags/node.html">Node</a><a href="/tags/css.html">CSS</a><a href="/tags/ios.html">iOS</a><a href="https://www.jiandanxinli.com/pages/37">Join Us</a></div></div><div class="animated_container"><div class="content container animated fadeIn delay"><h2>Rails遗留程序里最常犯的错误(译)</h2><div class="meta"><span class="date">2014-07-23</span><span class="author">韩冰</span></div><p>原文出自<a href="http://edelpero.svbtle.com/most-common-mistakes-on-legacy-rails-apps">most-common-mistakes-on-legacy-rails-apps</a>, 感谢作者<a href="http://edelpero.svbtle.com/">EZEQUIEL DELPERO</a></p>
<!DOCTYPE html><html lang="zh-CN"><head><meta content="IE=edge;chrome=1" http-equiv="X-UA-Compatible" /><meta content="width=device-width, initial-scale=1" name="viewport" /><title>Rails遗留程序里最常犯的错误(译) · 简单心理技术团队</title><link href="/stylesheets/app.css" rel="stylesheet" /><link rel="alternate" type="application/atom+xml" title="Atom Feed" href="/feed.xml" /><link href="/images/favicon.ico" rel="icon" /></head><body><div class="animated fadeInDown"><div class="header container"><a class="logo" href="/"><img src="/images/logo.png" alt="Logo" /></a><h1><a href="/">简单心理 · 技术团队</a></h1><a class="github" href="https://github.com/jiandanxinli">github.com/jiandanxinli</a></div><div class="subheader container"><a href="/tags/ruby.html" class="active">Ruby</a><a href="/tags/web.html">Web</a><a href="/tags/api.html">API</a><a href="/tags/ubuntu.html">Ubuntu</a><a href="/tags/nginx.html">Nginx</a><a href="/tags/ipv6.html">IPv6</a><a href="/tags/node.html">Node</a><a href="/tags/css.html">CSS</a><a href="/tags/git.html">Git</a><a href="/tags/ios.html">iOS</a><a href="https://www.jiandanxinli.com/pages/37">Join Us</a></div></div><div class="animated_container"><div class="content container animated fadeIn delay"><h2>Rails遗留程序里最常犯的错误(译)</h2><div class="meta"><span class="date">2014-07-23</span><span class="author">韩冰</span></div><p>原文出自<a href="http://edelpero.svbtle.com/most-common-mistakes-on-legacy-rails-apps">most-common-mistakes-on-legacy-rails-apps</a>, 感谢作者<a href="http://edelpero.svbtle.com/">EZEQUIEL DELPERO</a></p>

<p>近来我一直在对几个遗留项目作维护。</p>

Expand Down
2 changes: 1 addition & 1 deletion 2014.html
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!DOCTYPE html><html lang="zh-CN"><head><meta content="IE=edge;chrome=1" http-equiv="X-UA-Compatible" /><meta content="width=device-width, initial-scale=1" name="viewport" /><title>简单心理技术团队</title><link href="/stylesheets/app.css" rel="stylesheet" /><link rel="alternate" type="application/atom+xml" title="Atom Feed" href="/feed.xml" /><link href="/images/favicon.ico" rel="icon" /></head><body><div class="header container"><a class="logo" href="/"><img src="/images/logo.png" alt="Logo" /></a><h1><a href="/">简单心理 · 技术团队</a></h1><a class="github" href="https://github.com/jiandanxinli">github.com/jiandanxinli</a></div><div class="subheader container"><p>Hello, world!</p><a href="/tags/ruby.html">Ruby</a><a href="/tags/web.html">Web</a><a href="/tags/api.html">API</a><a href="/tags/ubuntu.html">Ubuntu</a><a href="/tags/nginx.html">Nginx</a><a href="/tags/ipv6.html">IPv6</a><a href="/tags/node.html">Node</a><a href="/tags/css.html">CSS</a><a href="/tags/ios.html">iOS</a><a href="https://www.jiandanxinli.com/pages/37">Join Us</a></div><div class="animated_container"><div class="content container animated fadeIn"><h1>Archive for
<!DOCTYPE html><html lang="zh-CN"><head><meta content="IE=edge;chrome=1" http-equiv="X-UA-Compatible" /><meta content="width=device-width, initial-scale=1" name="viewport" /><title>简单心理技术团队</title><link href="/stylesheets/app.css" rel="stylesheet" /><link rel="alternate" type="application/atom+xml" title="Atom Feed" href="/feed.xml" /><link href="/images/favicon.ico" rel="icon" /></head><body><div class="header container"><a class="logo" href="/"><img src="/images/logo.png" alt="Logo" /></a><h1><a href="/">简单心理 · 技术团队</a></h1><a class="github" href="https://github.com/jiandanxinli">github.com/jiandanxinli</a></div><div class="subheader container"><p>Hello, world!</p><a href="/tags/ruby.html">Ruby</a><a href="/tags/web.html">Web</a><a href="/tags/api.html">API</a><a href="/tags/ubuntu.html">Ubuntu</a><a href="/tags/nginx.html">Nginx</a><a href="/tags/ipv6.html">IPv6</a><a href="/tags/node.html">Node</a><a href="/tags/css.html">CSS</a><a href="/tags/git.html">Git</a><a href="/tags/ios.html">iOS</a><a href="https://www.jiandanxinli.com/pages/37">Join Us</a></div><div class="animated_container"><div class="content container animated fadeIn"><h1>Archive for
2014
</h1>

Expand Down
2 changes: 1 addition & 1 deletion 2014/07.html
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!DOCTYPE html><html lang="zh-CN"><head><meta content="IE=edge;chrome=1" http-equiv="X-UA-Compatible" /><meta content="width=device-width, initial-scale=1" name="viewport" /><title>简单心理技术团队</title><link href="/stylesheets/app.css" rel="stylesheet" /><link rel="alternate" type="application/atom+xml" title="Atom Feed" href="/feed.xml" /><link href="/images/favicon.ico" rel="icon" /></head><body><div class="header container"><a class="logo" href="/"><img src="/images/logo.png" alt="Logo" /></a><h1><a href="/">简单心理 · 技术团队</a></h1><a class="github" href="https://github.com/jiandanxinli">github.com/jiandanxinli</a></div><div class="subheader container"><p>Hello, world!</p><a href="/tags/ruby.html">Ruby</a><a href="/tags/web.html">Web</a><a href="/tags/api.html">API</a><a href="/tags/ubuntu.html">Ubuntu</a><a href="/tags/nginx.html">Nginx</a><a href="/tags/ipv6.html">IPv6</a><a href="/tags/node.html">Node</a><a href="/tags/css.html">CSS</a><a href="/tags/ios.html">iOS</a><a href="https://www.jiandanxinli.com/pages/37">Join Us</a></div><div class="animated_container"><div class="content container animated fadeIn"><h1>Archive for
<!DOCTYPE html><html lang="zh-CN"><head><meta content="IE=edge;chrome=1" http-equiv="X-UA-Compatible" /><meta content="width=device-width, initial-scale=1" name="viewport" /><title>简单心理技术团队</title><link href="/stylesheets/app.css" rel="stylesheet" /><link rel="alternate" type="application/atom+xml" title="Atom Feed" href="/feed.xml" /><link href="/images/favicon.ico" rel="icon" /></head><body><div class="header container"><a class="logo" href="/"><img src="/images/logo.png" alt="Logo" /></a><h1><a href="/">简单心理 · 技术团队</a></h1><a class="github" href="https://github.com/jiandanxinli">github.com/jiandanxinli</a></div><div class="subheader container"><p>Hello, world!</p><a href="/tags/ruby.html">Ruby</a><a href="/tags/web.html">Web</a><a href="/tags/api.html">API</a><a href="/tags/ubuntu.html">Ubuntu</a><a href="/tags/nginx.html">Nginx</a><a href="/tags/ipv6.html">IPv6</a><a href="/tags/node.html">Node</a><a href="/tags/css.html">CSS</a><a href="/tags/git.html">Git</a><a href="/tags/ios.html">iOS</a><a href="https://www.jiandanxinli.com/pages/37">Join Us</a></div><div class="animated_container"><div class="content container animated fadeIn"><h1>Archive for
Jul 2014
</h1>

Expand Down
2 changes: 1 addition & 1 deletion 2014/07/23.html
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!DOCTYPE html><html lang="zh-CN"><head><meta content="IE=edge;chrome=1" http-equiv="X-UA-Compatible" /><meta content="width=device-width, initial-scale=1" name="viewport" /><title>简单心理技术团队</title><link href="/stylesheets/app.css" rel="stylesheet" /><link rel="alternate" type="application/atom+xml" title="Atom Feed" href="/feed.xml" /><link href="/images/favicon.ico" rel="icon" /></head><body><div class="header container"><a class="logo" href="/"><img src="/images/logo.png" alt="Logo" /></a><h1><a href="/">简单心理 · 技术团队</a></h1><a class="github" href="https://github.com/jiandanxinli">github.com/jiandanxinli</a></div><div class="subheader container"><p>Hello, world!</p><a href="/tags/ruby.html">Ruby</a><a href="/tags/web.html">Web</a><a href="/tags/api.html">API</a><a href="/tags/ubuntu.html">Ubuntu</a><a href="/tags/nginx.html">Nginx</a><a href="/tags/ipv6.html">IPv6</a><a href="/tags/node.html">Node</a><a href="/tags/css.html">CSS</a><a href="/tags/ios.html">iOS</a><a href="https://www.jiandanxinli.com/pages/37">Join Us</a></div><div class="animated_container"><div class="content container animated fadeIn"><h1>Archive for
<!DOCTYPE html><html lang="zh-CN"><head><meta content="IE=edge;chrome=1" http-equiv="X-UA-Compatible" /><meta content="width=device-width, initial-scale=1" name="viewport" /><title>简单心理技术团队</title><link href="/stylesheets/app.css" rel="stylesheet" /><link rel="alternate" type="application/atom+xml" title="Atom Feed" href="/feed.xml" /><link href="/images/favicon.ico" rel="icon" /></head><body><div class="header container"><a class="logo" href="/"><img src="/images/logo.png" alt="Logo" /></a><h1><a href="/">简单心理 · 技术团队</a></h1><a class="github" href="https://github.com/jiandanxinli">github.com/jiandanxinli</a></div><div class="subheader container"><p>Hello, world!</p><a href="/tags/ruby.html">Ruby</a><a href="/tags/web.html">Web</a><a href="/tags/api.html">API</a><a href="/tags/ubuntu.html">Ubuntu</a><a href="/tags/nginx.html">Nginx</a><a href="/tags/ipv6.html">IPv6</a><a href="/tags/node.html">Node</a><a href="/tags/css.html">CSS</a><a href="/tags/git.html">Git</a><a href="/tags/ios.html">iOS</a><a href="https://www.jiandanxinli.com/pages/37">Join Us</a></div><div class="animated_container"><div class="content container animated fadeIn"><h1>Archive for
Jul 23 2014
</h1>

Expand Down
2 changes: 1 addition & 1 deletion 2015-09-08.html
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!DOCTYPE html><html lang="zh-CN"><head><meta content="IE=edge;chrome=1" http-equiv="X-UA-Compatible" /><meta content="width=device-width, initial-scale=1" name="viewport" /><title>2.5 个人如何开发一款跨终端的产品？[Ruby Tuesday 的分享] · 简单心理技术团队</title><link href="/stylesheets/app.css" rel="stylesheet" /><link rel="alternate" type="application/atom+xml" title="Atom Feed" href="/feed.xml" /><link href="/images/favicon.ico" rel="icon" /></head><body><div class="animated fadeInDown"><div class="header container"><a class="logo" href="/"><img src="/images/logo.png" alt="Logo" /></a><h1><a href="/">简单心理 · 技术团队</a></h1><a class="github" href="https://github.com/jiandanxinli">github.com/jiandanxinli</a></div><div class="subheader container"><a href="/tags/ruby.html" class="active">Ruby</a><a href="/tags/web.html" class="active">Web</a><a href="/tags/api.html">API</a><a href="/tags/ubuntu.html">Ubuntu</a><a href="/tags/nginx.html">Nginx</a><a href="/tags/ipv6.html">IPv6</a><a href="/tags/node.html">Node</a><a href="/tags/css.html">CSS</a><a href="/tags/ios.html">iOS</a><a href="https://www.jiandanxinli.com/pages/37">Join Us</a></div></div><div class="animated_container"><div class="content container animated fadeIn delay"><h2>2.5 个人如何开发一款跨终端的产品？[Ruby Tuesday 的分享]</h2><div class="meta"><span class="date">2015-09-08</span><span class="author">Ben</span></div><h2>2.5 个人？</h2>
<!DOCTYPE html><html lang="zh-CN"><head><meta content="IE=edge;chrome=1" http-equiv="X-UA-Compatible" /><meta content="width=device-width, initial-scale=1" name="viewport" /><title>2.5 个人如何开发一款跨终端的产品？[Ruby Tuesday 的分享] · 简单心理技术团队</title><link href="/stylesheets/app.css" rel="stylesheet" /><link rel="alternate" type="application/atom+xml" title="Atom Feed" href="/feed.xml" /><link href="/images/favicon.ico" rel="icon" /></head><body><div class="animated fadeInDown"><div class="header container"><a class="logo" href="/"><img src="/images/logo.png" alt="Logo" /></a><h1><a href="/">简单心理 · 技术团队</a></h1><a class="github" href="https://github.com/jiandanxinli">github.com/jiandanxinli</a></div><div class="subheader container"><a href="/tags/ruby.html" class="active">Ruby</a><a href="/tags/web.html" class="active">Web</a><a href="/tags/api.html">API</a><a href="/tags/ubuntu.html">Ubuntu</a><a href="/tags/nginx.html">Nginx</a><a href="/tags/ipv6.html">IPv6</a><a href="/tags/node.html">Node</a><a href="/tags/css.html">CSS</a><a href="/tags/git.html">Git</a><a href="/tags/ios.html">iOS</a><a href="https://www.jiandanxinli.com/pages/37">Join Us</a></div></div><div class="animated_container"><div class="content container animated fadeIn delay"><h2>2.5 个人如何开发一款跨终端的产品？[Ruby Tuesday 的分享]</h2><div class="meta"><span class="date">2015-09-08</span><span class="author">Ben</span></div><h2>2.5 个人？</h2>

<ul>
<li>1 个全栈（我 ^_^）</li>
Expand Down
2 changes: 1 addition & 1 deletion 2015.html
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!DOCTYPE html><html lang="zh-CN"><head><meta content="IE=edge;chrome=1" http-equiv="X-UA-Compatible" /><meta content="width=device-width, initial-scale=1" name="viewport" /><title>简单心理技术团队</title><link href="/stylesheets/app.css" rel="stylesheet" /><link rel="alternate" type="application/atom+xml" title="Atom Feed" href="/feed.xml" /><link href="/images/favicon.ico" rel="icon" /></head><body><div class="header container"><a class="logo" href="/"><img src="/images/logo.png" alt="Logo" /></a><h1><a href="/">简单心理 · 技术团队</a></h1><a class="github" href="https://github.com/jiandanxinli">github.com/jiandanxinli</a></div><div class="subheader container"><p>Hello, world!</p><a href="/tags/ruby.html">Ruby</a><a href="/tags/web.html">Web</a><a href="/tags/api.html">API</a><a href="/tags/ubuntu.html">Ubuntu</a><a href="/tags/nginx.html">Nginx</a><a href="/tags/ipv6.html">IPv6</a><a href="/tags/node.html">Node</a><a href="/tags/css.html">CSS</a><a href="/tags/ios.html">iOS</a><a href="https://www.jiandanxinli.com/pages/37">Join Us</a></div><div class="animated_container"><div class="content container animated fadeIn"><h1>Archive for
<!DOCTYPE html><html lang="zh-CN"><head><meta content="IE=edge;chrome=1" http-equiv="X-UA-Compatible" /><meta content="width=device-width, initial-scale=1" name="viewport" /><title>简单心理技术团队</title><link href="/stylesheets/app.css" rel="stylesheet" /><link rel="alternate" type="application/atom+xml" title="Atom Feed" href="/feed.xml" /><link href="/images/favicon.ico" rel="icon" /></head><body><div class="header container"><a class="logo" href="/"><img src="/images/logo.png" alt="Logo" /></a><h1><a href="/">简单心理 · 技术团队</a></h1><a class="github" href="https://github.com/jiandanxinli">github.com/jiandanxinli</a></div><div class="subheader container"><p>Hello, world!</p><a href="/tags/ruby.html">Ruby</a><a href="/tags/web.html">Web</a><a href="/tags/api.html">API</a><a href="/tags/ubuntu.html">Ubuntu</a><a href="/tags/nginx.html">Nginx</a><a href="/tags/ipv6.html">IPv6</a><a href="/tags/node.html">Node</a><a href="/tags/css.html">CSS</a><a href="/tags/git.html">Git</a><a href="/tags/ios.html">iOS</a><a href="https://www.jiandanxinli.com/pages/37">Join Us</a></div><div class="animated_container"><div class="content container animated fadeIn"><h1>Archive for
2015
</h1>

Expand Down
Loading

0 comments on commit bc0f207

Please sign in to comment.