Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
adam.huang
Oh My Zsh
Commits
e2838f75
Commit
e2838f75
authored
Jan 02, 2014
by
Robby Russell
Browse files
Merge pull request #2396 from soluwalana/master
Fix WIP false positive
parents
a38af279
d60522c7
Changes
1
Hide whitespace changes
Inline
Side-by-side
plugins/git/git.plugin.zsh
View file @
e2838f75
...
@@ -142,13 +142,13 @@ compdef _git glp=git-log
...
@@ -142,13 +142,13 @@ compdef _git glp=git-log
#
#
# This function return a warning if the current branch is a wip
# This function return a warning if the current branch is a wip
function
work_in_progress
()
{
function
work_in_progress
()
{
if
$(
git log
-n
1 2>/dev/null |
grep
-q
-c
wip
)
;
then
if
$(
git log
-n
1 2>/dev/null |
grep
-q
-c
"
\-\-
wip
\-\-
"
)
;
then
echo
"WIP!!"
echo
"WIP!!"
fi
fi
}
}
# these alias commit and uncomit wip branches
# 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 -0 git rm; git commit -m "
--
wip
--
"'
alias
gunwip
=
'git log -n 1 | grep -q -c
wip
&& git reset HEAD~1'
alias
gunwip
=
'git log -n 1 | grep -q -c
"\-\-wip\-\-"
&& git reset HEAD~1'
# these alias ignore changes to file
# these alias ignore changes to file
alias
gignore
=
'git update-index --assume-unchanged'
alias
gignore
=
'git update-index --assume-unchanged'
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment