diff: changed the diff script to an alias
This commit is contained in:
13
README.md
13
README.md
@@ -3,7 +3,6 @@
|
|||||||
This is a collection of simple scripts to make using `git` easier.
|
This is a collection of simple scripts to make using `git` easier.
|
||||||
|
|
||||||
* commit - make using `git-commmit` easier
|
* commit - make using `git-commmit` easier
|
||||||
* diff - make using `git-diff` easier
|
|
||||||
* feature - make working with feature branches easier
|
* feature - make working with feature branches easier
|
||||||
* xgrep - make using `git-grep` easier
|
* xgrep - make using `git-grep` easier
|
||||||
|
|
||||||
@@ -46,18 +45,6 @@ commit this is a sample commit message
|
|||||||
|
|
||||||
generates the command `git commit -m "this is a sample commit message"`.
|
generates the command `git commit -m "this is a sample commit message"`.
|
||||||
|
|
||||||
## Diff utility
|
|
||||||
|
|
||||||
This utility makes it easier to check differences ignoring white spaces.
|
|
||||||
No need to specify the `-w` parameter.
|
|
||||||
For example,
|
|
||||||
|
|
||||||
```
|
|
||||||
diff master
|
|
||||||
```
|
|
||||||
|
|
||||||
generates the command `git diff -w master`.
|
|
||||||
|
|
||||||
## Feature utility
|
## Feature utility
|
||||||
|
|
||||||
### Usage
|
### Usage
|
||||||
|
|||||||
7
bin/diff
7
bin/diff
@@ -1,7 +0,0 @@
|
|||||||
#!/usr/bin/env ruby
|
|
||||||
|
|
||||||
args = ARGV.join(' ')
|
|
||||||
|
|
||||||
command = "git diff -w #{args}"
|
|
||||||
|
|
||||||
exec command
|
|
||||||
@@ -6,6 +6,9 @@ alias pull="git pull"
|
|||||||
alias push="git push"
|
alias push="git push"
|
||||||
alias master="git checkout master"
|
alias master="git checkout master"
|
||||||
alias develop="git checkout develop"
|
alias develop="git checkout develop"
|
||||||
|
alias diff="git diff -w"
|
||||||
|
alias linuxdiff="/usr/bin/diff"
|
||||||
|
alias sysdiff="/usr/bin/diff"
|
||||||
#alias log="git log --graph --decorate --abbrev-commit --pretty=oneline"
|
#alias log="git log --graph --decorate --abbrev-commit --pretty=oneline"
|
||||||
alias log="git log --graph --date=short --pretty=format:'%C(yellow)%h %C(white)%ad %C(black)[%C(green)%an%C(black)] %C(blue)%s%C(yellow)%d'"
|
alias log="git log --graph --date=short --pretty=format:'%C(yellow)%h %C(white)%ad %C(black)[%C(green)%an%C(black)] %C(blue)%s%C(yellow)%d'"
|
||||||
alias stash="git stash save"
|
alias stash="git stash save"
|
||||||
|
|||||||
Reference in New Issue
Block a user