Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
O
oh-my-zsh
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
JIRA
JIRA
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
github
oh-my-zsh
Commits
e2838f75
Commit
e2838f75
authored
Jan 03, 2014
by
Robby Russell
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #2396 from soluwalana/master
Fix WIP false positive
parents
a38af279
d60522c7
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
git.plugin.zsh
plugins/git/git.plugin.zsh
+3
-3
No files found.
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