wip
This commit is contained in:
19
.github/alias.txt
vendored
Normal file
19
.github/alias.txt
vendored
Normal file
@@ -0,0 +1,19 @@
|
|||||||
|
|
||||||
|
**Powershell
|
||||||
|
git config --global alias.save-wip "!f() { git add . ; if (git log -1 --format=%s -eq 'wip') { git commit --amend --no-edit } else { git commit -m 'wip' }; git push origin `$(git branch --show-current):wip-sync --force-with-lease; }; f"
|
||||||
|
git config --global alias.load-wip "!f() { if (git diff-index --quiet HEAD --) { git fetch origin wip-sync; git merge origin/wip-sync; if (git log -1 --format=%s -eq 'wip') { git reset --soft HEAD~1; echo 'WIP Loaded and unwrapped.' } else { echo 'No WIP found. Merge complete.' } } else { echo 'Error: Uncommitted changes detected.'; exit 1 }; }; f"
|
||||||
|
git config --global alias.abort-wip "git reset --hard HEAD"
|
||||||
|
|
||||||
|
**Git Bash
|
||||||
|
git config --global alias.save-wip '!f() { git add . ; if [ "$(git log -1 --format=%s)" = "wip" ]; then git commit --amend --no-edit; else git commit -m "wip"; fi; git push origin $(git branch --show-current):wip-sync --force-with-lease; }; f'
|
||||||
|
git config --global alias.load-wip '!f() { if ! git diff-index --quiet HEAD --; then echo "Error: Uncommitted changes detected."; exit 1; fi; git fetch origin wip-sync && git merge origin/wip-sync && if [ "$(git log -1 --format=%s)" = "wip" ]; then git reset --soft HEAD~1; echo "WIP Loaded and unwrapped."; else echo "No WIP found. Merge complete."; fi; }; f'
|
||||||
|
git config --global alias.abort-wip 'git reset --hard HEAD'
|
||||||
|
|
||||||
|
|
||||||
|
**Mac
|
||||||
|
git config --global alias.save-wip '!f() { git add . ; if [ "$(git log -1 --format=%s)" = "wip" ]; then git commit --amend --no-edit; else git commit -m "wip"; fi; git push origin $(git branch --show-current):wip-sync --force-with-lease; }; f'
|
||||||
|
git config --global alias.load-wip '!f() { if ! git diff-index --quiet HEAD --; then echo "Error: Uncommitted changes detected."; exit 1; fi; git fetch origin wip-sync && git merge origin/wip-sync && if [ "$(git log -1 --format=%s)" = "wip" ]; then git reset --soft HEAD~1; echo "WIP Loaded and unwrapped."; else echo "No WIP found. Merge complete."; fi; }; f'
|
||||||
|
git config --global alias.abort-wip 'git reset --hard HEAD'
|
||||||
|
|
||||||
|
***Reset wip-sync
|
||||||
|
git push origin --delete wip-sync
|
||||||
6
.idea/copilot.data.migration.agent.xml
generated
Normal file
6
.idea/copilot.data.migration.agent.xml
generated
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project version="4">
|
||||||
|
<component name="AgentMigrationStateService">
|
||||||
|
<option name="migrationStatus" value="COMPLETED" />
|
||||||
|
</component>
|
||||||
|
</project>
|
||||||
6
.idea/copilot.data.migration.edit.xml
generated
Normal file
6
.idea/copilot.data.migration.edit.xml
generated
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project version="4">
|
||||||
|
<component name="EditMigrationStateService">
|
||||||
|
<option name="migrationStatus" value="COMPLETED" />
|
||||||
|
</component>
|
||||||
|
</project>
|
||||||
72
.vscode/tasks.json
vendored
72
.vscode/tasks.json
vendored
@@ -1,31 +1,45 @@
|
|||||||
{
|
{
|
||||||
"version": "2.0.0",
|
"version": "2.0.0",
|
||||||
"tasks": [
|
"tasks": [
|
||||||
{
|
{
|
||||||
"label": "Save Work In Progress",
|
"label": "Git: Save WIP",
|
||||||
"type": "shell",
|
"type": "shell",
|
||||||
"command": "git",
|
"command": "git save-wip",
|
||||||
"args": ["savewip"],
|
"group": "build",
|
||||||
"group": "build",
|
"presentation": {
|
||||||
"presentation": {
|
"reveal": "always",
|
||||||
"echo": true,
|
"panel": "shared"
|
||||||
"reveal": "silent",
|
}
|
||||||
"focus": false,
|
},
|
||||||
"panel": "shared"
|
{
|
||||||
}
|
"label": "Git: Load WIP",
|
||||||
},
|
"type": "shell",
|
||||||
{
|
"command": "git load-wip",
|
||||||
"label": "Load Work In Progress",
|
"group": "build",
|
||||||
"type": "shell",
|
"presentation": {
|
||||||
"command": "git",
|
"reveal": "always",
|
||||||
"args": ["loadwip"],
|
"panel": "shared"
|
||||||
"group": "build",
|
}
|
||||||
"presentation": {
|
},
|
||||||
"echo": true,
|
{
|
||||||
"reveal": "silent",
|
"label": "Git: Reset Cloud WIP",
|
||||||
"focus": false,
|
"type": "shell",
|
||||||
"panel": "shared"
|
"command": "git push origin --delete wip-sync",
|
||||||
}
|
"presentation": {
|
||||||
}
|
"reveal": "always",
|
||||||
]
|
"panel": "shared"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"label": "Git: Abort WIP (Reset Local)",
|
||||||
|
"type": "shell",
|
||||||
|
"command": "git abort-wip",
|
||||||
|
"group": "none",
|
||||||
|
"presentation": {
|
||||||
|
"reveal": "always",
|
||||||
|
"panel": "shared",
|
||||||
|
"echo": true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user