diff options
author | Bob Williams <bobwilliams.ii@gmail.com> | 2014-03-22 21:24:52 -0400 |
---|---|---|
committer | Bob Williams <bobwilliams.ii@gmail.com> | 2014-03-22 21:24:52 -0400 |
commit | d70e73294494e68c94879c7bf22f708a3049a9d4 (patch) | |
tree | 696f9a6cb49cab00924942eb5147b99b5fb1798d /plugins/git | |
parent | 5a586670d73dbbda97d124e33398aabf21597659 (diff) | |
parent | 178b5224e830845e45070ef803fcdb5a3f468dca (diff) | |
download | zsh-d70e73294494e68c94879c7bf22f708a3049a9d4.tar.gz zsh-d70e73294494e68c94879c7bf22f708a3049a9d4.tar.bz2 zsh-d70e73294494e68c94879c7bf22f708a3049a9d4.zip |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'plugins/git')
-rw-r--r-- | plugins/git/git.plugin.zsh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh index 2b5983f33..9f7819df3 100644 --- a/plugins/git/git.plugin.zsh +++ b/plugins/git/git.plugin.zsh @@ -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 |