Skip to content

Add git stash, unstash and reset. #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Nov 2, 2016
Merged

Add git stash, unstash and reset. #14

merged 4 commits into from
Nov 2, 2016

Conversation

KevenYoung
Copy link
Contributor

Add stash, unstash and reset in Git menu.

}
}

export const GIT_UPDATE_UNSTASH_IS_REINSTATE= 'GIT_UPDATE_UNSTASH_IS_REINSTATE'
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

=前少一个空格

}
}

export const GIT_UPDATE_UNSTASH_BRANCH_NAME= 'GIT_UPDATE_UNSTASH_BRANCH_NAME'
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

=前少一个空格

}

handleConfirm (e) {
console.log('handleConfirm')
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

删除掉

}

handleChangeOption (e) {
console.log('handleChangeOption')
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

删除掉

@KevenYoung
Copy link
Contributor Author

@vangie 已经修改了

@vangie
Copy link
Collaborator

vangie commented Oct 31, 2016

LGTM

@@ -1,7 +1,7 @@
/* @flow weak */
import api from '../../api'
import { notify } from '../Notification/actions'
import { dismissModal } from '../Modal/actions'
import { notify, error } from '../Notification/actions'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

error 也太 concise 了...容易有误会,建议改成 notifyError 或者任何更具特征性的命名。

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

又或者可以考虑把 notify 函数改成一个能接受 "error" 参数的形式?

min-width: 600px;
min-height: 20px;
padding: 0.75em;
z-index: z(modal);
border-radius: 4px;
background-color: #FFF;
box-shadow: 0 4px 20px 1px rgba(0, 0, 0, .3);
}

h1
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

选用 stylus 主要是因为它语法包容性高且 package 小不爱出错,但鉴于这是开源项目,希望还是用尽量近似 scss 的语法,不要用缩进语法

@hackape
Copy link
Contributor

hackape commented Nov 1, 2016

@KevenYoung 另外,我开始在 state 的其他部分应用 FSA 了,就是 action object 的结构要求写作:{type: string, payload?: any, meta?: any} 的形式。这个 PR 里我就不管了,之后你一边写一边慢慢往这个结构改吧。

@hackape hackape merged commit 5c0cfe6 into master Nov 2, 2016
@hackape hackape deleted the yangzhen/stash branch March 7, 2017 03:13
KevenYoung pushed a commit that referenced this pull request Aug 14, 2018
chunqiuyiyu pushed a commit that referenced this pull request Dec 7, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants