Permalink
Browse files

Preparing for major repo merge

  • Loading branch information...
miped committed Feb 10, 2013
0 parents commit e003aa9f3815dc1198234a18df72cb5af62611a1
@@ -0,0 +1,56 @@
[
/*** GIT STATUS ***/
// Refresh
{ "keys": ["super+r"], "command": "git_status_refresh",
"context": [{ "key": "selector", "operator": "equal", "operand": "text.git-status" }]
},
// Section shortcuts
{ "keys": ["ctrl+1"], "command": "git_status_move", "args": {"goto": "section:stashes"},
"context": [
{ "key": "selector", "operator": "equal", "operand": "text.git-status" }
]
},
{ "keys": ["ctrl+2"], "command": "git_status_move", "args": {"goto": "section:untracked_files"},
"context": [
{ "key": "selector", "operator": "equal", "operand": "text.git-status" }
]
},
{ "keys": ["ctrl+3"], "command": "git_status_move", "args": {"goto": "section:unstaged_changes"},
"context": [
{ "key": "selector", "operator": "equal", "operand": "text.git-status" }
]
},
{ "keys": ["ctrl+4"], "command": "git_status_move", "args": {"goto": "section:staged_changes"},
"context": [
{ "key": "selector", "operator": "equal", "operand": "text.git-status" }
]
},
{ "keys": ["ctrl+5"], "command": "git_status_move", "args": {"goto": "section:unpushed_commits"},
"context": [
{ "key": "selector", "operator": "equal", "operand": "text.git-status" }
]
},
// Stage command (global)
{ "keys": ["super+k", "s"], "command": "git_status_stage", "args": {"stage": "all"},
"context": [
{ "key": "selector", "operator": "equal", "operand": "text.git-status"}
]
},
// overwrite some stuff
{ "keys": ["super+s"], "command": "noop", "context": [{ "key": "selector", "operator": "equal", "operand": "text.git-status"}]},
{ "keys": ["super+z"], "command": "noop", "context": [{ "key": "selector", "operator": "equal", "operand": "text.git-status"}]},
{ "keys": ["super+y"], "command": "noop", "context": [{ "key": "selector", "operator": "equal", "operand": "text.git-status"}]},
/*** END GIT STATUS ***/
/** GIT COMMIT **/
// overwrite some stuff
{ "keys": ["super+s"], "command": "noop", "context": [{ "key": "selector", "operator": "equal", "operand": "text.git-commit"}]}
/** END GIT COMMIT **/
]
@@ -0,0 +1,55 @@
[
{ "caption": "Git", "command": "git_cli"},
{ "caption": "Git Async", "command": "git_cli_async"},
{ "caption": "Git: Version", "command": "git_version"},
{ "caption": "Git: Help", "command": "git_help"},
{ "caption": "Git: Init", "command": "git_init"},
{ "caption": "Git: Status", "command": "git_status"},
{ "caption": "Git: Refresh Status", "command": "git_status_refresh"},
{ "caption": "Git: Quick Status", "command": "git_quick_status"},
{ "caption": "Git: Diff", "command": "git_diff"},
{ "caption": "Git: Diff Cached", "command": "git_diff", "args": {"cached": true}},
{ "caption": "Git: Add Current File", "command": "git_add_current_file"},
{ "caption": "Git: Quick Add", "command": "git_quick_add"},
{ "caption": "Git: Commit", "command": "git_commit"},
{ "caption": "Git: Quick Commit", "command": "git_quick_commit"},
{ "caption": "Git: Stash", "command": "git_stash"},
{ "caption": "Git: Snapshot", "command": "git_snapshot"},
{ "caption": "Git: Pop Stash", "command": "git_stash_pop"},
{ "caption": "Git: Apply Stash", "command": "git_stash_apply"},
{ "caption": "Git: Checkout", "command": "git_checkout_branch"},
{ "caption": "Git: Checkout New Branch", "command": "git_checkout_new_branch"},
{ "caption": "Git: Checkout Commit", "command": "git_checkout_commit"},
{ "caption": "Git: Merge", "command": "git_merge"},
{ "caption": "Git: Add Remote", "command": "git_remote_add"},
{ "caption": "Git: Remote", "command": "git_remote"},
{ "caption": "Git: Fetch", "command": "git_fetch"},
{ "caption": "Git: Push", "command": "git_push_pull_all", "args": {"command": "push"}},
{ "caption": "Git: Push Current Branch", "command": "git_push_current_branch"},
{ "caption": "Git: Pull", "command": "git_push_pull_all", "args": {"command": "pull"}},
{ "caption": "Git: Pull Current Branch", "command": "git_pull_current_branch"},
{ "caption": "Git: Log", "command": "git_log", "args": {}},
{ "caption": "Git: Quick Log", "command": "git_quick_log" },
{ "caption": "Git: Quick Log Current File", "command": "git_quick_log_current_file"},
{ "caption": "Git: Show", "command": "git_show"},
{ "caption": "Legit: Branches", "command": "legit_branches"},
{ "caption": "Legit: Sync", "command": "legit_sync"},
{ "caption": "Legit: Switch", "command": "legit_switch"},
{ "caption": "Legit: Publish", "command": "legit_publish"},
{ "caption": "Legit: Unpublish", "command": "legit_unpublish"},
{ "caption": "Legit: Graft", "command": "legit_graft"},
{ "caption": "Legit: Sprout", "command": "legit_sprout"},
{ "caption": "Legit: Harvest", "command": "legit_harvest"}
]
@@ -0,0 +1,190 @@
[
/*** GIT STATUS ***/
// Refresh
{ "keys": ["r"], "command": "git_status_refresh",
"context": [{ "key": "selector", "operator": "equal", "operand": "text.git-status" }]
},
// Section shortcuts
{ "keys": ["1"], "command": "git_status_move", "args": {"goto": "section:1"},
"context": [
{ "key": "selector", "operator": "equal", "operand": "text.git-status" }
]
},
{ "keys": ["2"], "command": "git_status_move", "args": {"goto": "section:2"},
"context": [
{ "key": "selector", "operator": "equal", "operand": "text.git-status" }
]
},
{ "keys": ["3"], "command": "git_status_move", "args": {"goto": "section:3"},
"context": [
{ "key": "selector", "operator": "equal", "operand": "text.git-status" }
]
},
{ "keys": ["4"], "command": "git_status_move", "args": {"goto": "section:4"},
"context": [
{ "key": "selector", "operator": "equal", "operand": "text.git-status" }
]
},
{ "keys": ["5"], "command": "git_status_move", "args": {"goto": "section:5"},
"context": [
{ "key": "selector", "operator": "equal", "operand": "text.git-status" }
]
},
// Cycle through sections
{ "keys": ["N"], "command": "git_status_move", "args": {"goto": "section:next"},
"context": [
{ "key": "selector", "operator": "equal", "operand": "text.git-status" }
]
},
{ "keys": ["P"], "command": "git_status_move", "args": {"goto": "section:prev"},
"context": [
{ "key": "selector", "operator": "equal", "operand": "text.git-status" }
]
},
// Cycle through files
{ "keys": ["n"], "command": "git_status_move", "args": {"goto": "item:next"},
"context": [
{ "key": "selector", "operator": "equal", "operand": "text.git-status" }
]
},
{ "keys": ["p"], "command": "git_status_move", "args": {"goto": "item:prev"},
"context": [
{ "key": "selector", "operator": "equal", "operand": "text.git-status" }
]
},
// Stage command (global)
{ "keys": ["S"], "command": "git_status_stage", "args": {"stage": "unstaged"},
"context": [
{ "key": "selector", "operator": "equal", "operand": "text.git-status"}
]
},
// Stage command (untracked)
{ "keys": ["s"], "command": "git_status_stage", "args": {"stage": "section"},
"context": [
{ "key": "selector", "operator": "equal", "operand": "meta.git-status.untracked_files"},
{ "key": "selector", "operator": "equal", "operand": "constant.other.git-status.header"}
]
},
{ "keys": ["s"], "command": "git_status_stage", "args": {"stage": "file"},
"context": [
{ "key": "selector", "operator": "equal", "operand": "meta.git-status.untracked_files"},
{ "key": "selector", "operator": "equal", "operand": "meta.git-status.line"}
]
},
// Stage command (unstaged)
{ "keys": ["s"], "command": "git_status_stage", "args": {"stage": "section"},
"context": [
{ "key": "selector", "operator": "equal", "operand": "meta.git-status.unstaged_changes"},
{ "key": "selector", "operator": "equal", "operand": "constant.other.git-status.header"}
]
},
{ "keys": ["s"], "command": "git_status_stage", "args": {"stage": "file"},
"context": [
{ "key": "selector", "operator": "equal", "operand": "meta.git-status.unstaged_changes"},
{ "key": "selector", "operator": "equal", "operand": "meta.git-status.line"}
]
},
// Unstage command
{ "keys": ["U"], "command": "git_status_unstage", "args": {"unstage": "all"},
"context": [
{ "key": "selector", "operator": "equal", "operand": "text.git-status"}
]
},
{ "keys": ["u"], "command": "git_status_unstage", "args": {"unstage": "all"},
"context": [
{ "key": "selector", "operator": "equal", "operand": "meta.git-status.staged_changes"},
{ "key": "selector", "operator": "equal", "operand": "constant.other.git-status.header"}
]
},
{ "keys": ["u"], "command": "git_status_unstage", "args": {"unstage": "file"},
"context": [
{ "key": "selector", "operator": "equal", "operand": "meta.git-status.staged_changes"},
{ "key": "selector", "operator": "equal", "operand": "meta.git-status.line"}
]
},
// Discard command
{ "keys": ["k"], "command": "git_status_discard", "args": {"discard": "section"},
"context": [
{ "key": "selector", "operator": "equal", "operand": "constant.other.git-status.header"}
]
},
{ "keys": ["k"], "command": "git_status_discard", "args": {"discard": "item"},
"context": [
{ "key": "selector", "operator": "equal", "operand": "meta.git-status.line"}
]
},
{ "keys": ["K"], "command": "git_status_discard", "args": {"discard": "all"},
"context": [
{ "key": "selector", "operator": "equal", "operand": "text.git-status"}
]
},
// Ignore command (only untracked)
{ "keys": ["i"], "command": "git_status_ignore",
"context": [
{ "key": "selector", "operator": "equal", "operand": "meta.git-status.untracked_files"},
{ "key": "selector", "operator": "equal", "operand": "meta.git-status.line"}
]
},
{ "keys": ["I"], "command": "git_status_ignore", "args": {"edit_pattern": true},
"context": [
{ "key": "selector", "operator": "equal", "operand": "meta.git-status.untracked_files"},
{ "key": "selector", "operator": "equal", "operand": "meta.git-status.line"}
]
},
// Open command
{ "keys": ["enter"], "command": "git_status_open_file",
"context": [
{ "key": "selector", "operator": "equal", "operand": "meta.git-status.line"}
]
},
// Diff command
{ "keys": ["d"], "command": "git_status_diff",
"context": [
{ "key": "selector", "operator": "equal", "operand": "meta.git-status.line"}
]
},
// Stashes
{ "keys": ["z"], "command": "git_stash",
"context": [
{ "key": "selector", "operator": "equal", "operand": "text.git-status"}
]
},
{ "keys": ["a"], "command": "git_status_stash_apply",
"context": [
{ "key": "selector", "operator": "equal", "operand": "meta.git-status.stashes"},
{ "key": "selector", "operator": "equal", "operand": "meta.git-status.line"}
]
},
{ "keys": ["A"], "command": "git_status_stash_pop",
"context": [
{ "key": "selector", "operator": "equal", "operand": "meta.git-status.stashes"},
{ "key": "selector", "operator": "equal", "operand": "meta.git-status.line"}
]
},
// Commit command
{ "keys": ["c"], "command": "git_commit",
"context": [
{ "key": "selector", "operator": "equal", "operand": "text.git-status"}
]
},
{ "keys": ["C"], "command": "git_commit", "args": {"add": true },
"context": [
{ "key": "selector", "operator": "equal", "operand": "text.git-status"}
]
}
]
@@ -0,0 +1,88 @@
[
{
"caption": "Preferences",
"mnemonic": "n",
"id": "preferences",
"children":
[
{
"caption": "Package Settings",
"mnemonic": "P",
"id": "package-settings",
"children":
[
{
"caption": "SublimeGit",
"children":
[
{
"command": "open_file",
"args": {"file": "${packages}/SublimeGit/SublimeGit.sublime-settings"},
"caption": "Settings – Default"
},
{
"command": "open_file",
"args": {"file": "${packages}/User/SublimeGit.sublime-settings"},
"caption": "Settings – User"
},
{ "caption": "-" },
{
"command": "open_file",
"args": {"file": "${packages}/SublimeGit/Default.sublime-keymap"},
"caption": "Key Bindings – Default"
},
{
"command": "open_file",
"args": {
"file": "${packages}/SublimeGit/Default (Windows).sublime-keymap",
"platform": "Windows"
},
"caption": "Key Bindings – Default (Windows)"
},
{
"command": "open_file",
"args": {
"file": "${packages}/SublimeGit/Default (OSX).sublime-keymap",
"platform": "OSX"
},
"caption": "Key Bindings – Default (OSX)"
},
{
"command": "open_file",
"args": {
"file": "${packages}/SublimeGit/Default (Linux).sublime-keymap",
"platform": "Linux"
},
"caption": "Key Bindings – Default (Linux)"
},
{
"command": "open_file",
"args": {
"file": "${packages}/User/Default (Windows).sublime-keymap",
"platform": "Windows"
},
"caption": "Key Bindings – User"
},
{
"command": "open_file",
"args": {
"file": "${packages}/User/Default (OSX).sublime-keymap",
"platform": "OSX"
},
"caption": "Key Bindings – User"
},
{
"command": "open_file",
"args": {
"file": "${packages}/User/Default (Linux).sublime-keymap",
"platform": "Linux"
},
"caption": "Key Bindings – User"
}
]
}
]
}
]
}
]
Oops, something went wrong.

0 comments on commit e003aa9

Please sign in to comment.