linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2026-02-20 03:02:29 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge remote-tracking branch 'upstream/master'

Browse source 
Conflicts:
	templates/zshrc.zsh-template
This commit is contained in:
Gaetan Semet 2014-03-24 11:54:41 +01:00
commit 5afa441d66
36 changed files with 2060 additions and 103 deletions
Download patch file Download diff file Expand all files Collapse all files

2
plugins/git/git.plugin.zsh
View file

@ -149,7 +149,7 @@ function work_in_progress() {
fi
}
# these alias commit and uncomit wip branches
alias gwip='git add -A; git ls-files --deleted -z | xargs -0 git rm; git commit -m "--wip--"'
alias gwip='git add -A; git ls-files --deleted -z | xargs -r0 git rm; git commit -m "--wip--"'
alias gunwip='git log -n 1 | grep -q -c "\-\-wip\-\-" && git reset HEAD~1'
# these alias ignore changes to file