diff --git a/README.md b/README.md index 4a48125aa..4bc5839dd 100644 --- a/README.md +++ b/README.md @@ -119,6 +119,7 @@ This is the complete list of commands in the master branch on github. * [checkin](doc/commands/checkin.md): *checkin your git commits as one tfs changeset* - since 0.10 * [checkintool](doc/commands/checkintool.md): *checkin in tfs using the tfs checkin dialog* - since 0.10 * [shelve](doc/commands/shelve.md): *create a shelveset from git commits* - since 0.9 +* [shelve-delete](doc/commands/shelve-delete.md): *delete a shelveset on tfs* - since 0.25 ### Manage TFS branches diff --git a/doc/commands/shelve-delete.md b/doc/commands/shelve-delete.md new file mode 100644 index 000000000..770da7f46 --- /dev/null +++ b/doc/commands/shelve-delete.md @@ -0,0 +1,22 @@ +## Summary + +Deletes a TFS shelveset for the current user. + + Usage: git-tfs shelve-delete + -h, -H, --help + -V, --version + -d, --debug Show debug output about everything git-tfs does + -i, --tfs-remote, --remote, --id=VALUE + The remote ID of the TFS to interact with + default: default + +## Examples + +### Delete a shelveset. + +`git tfs shelve-delete "feature-reset-password"` + +## See also + +* [unshelve](unshelve.md) +* [shelve](unshelve.md) \ No newline at end of file diff --git a/doc/release-notes/NEXT.md b/doc/release-notes/NEXT.md index 234b15c1c..1785f6f80 100644 --- a/doc/release-notes/NEXT.md +++ b/doc/release-notes/NEXT.md @@ -2,4 +2,4 @@ * Log in a file git-tfs actions (#999, @pmiossec) * Add support of `.gitignore` to ignore files in `clone` and `init` commands (#897) * Improve branch point changeset detection (#1017 & #973, @fourpastmidnight & @jeremy-sylvis-tmg) - +* Add support for deleting TFS shelvesets using the shelve-delete command diff --git a/doc/usecases/working_with_shelvesets.md b/doc/usecases/working_with_shelvesets.md index 12e0a8853..65ada93f0 100644 --- a/doc/usecases/working_with_shelvesets.md +++ b/doc/usecases/working_with_shelvesets.md @@ -58,4 +58,10 @@ To create the shelveset, just do: git tfs shelve "try to solve bug234" +# Delete a shelveset + +When you no longer need the shelveset, you can delete it from TFS by using: + + git tfs shelve-delete "try to solve bug234" +