diff options
| author | brian m. carlson <sandals@crustytoothpaste.net> | 2025-06-12 01:12:20 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-06-12 13:32:18 -0700 |
| commit | bc303718cc288b54233b204ce88223a16fb38487 (patch) | |
| tree | 53738bfb5b1cad2c27e17f1a78819ddad9ace5b4 /Documentation | |
| parent | 27c0be9a3f3bb32781aadd1caec14c1e1846a5da (diff) | |
| download | git-bc303718cc288b54233b204ce88223a16fb38487.tar.xz | |
builtin/stash: provide a way to import stashes from a ref
Now that we have a way to export stashes to a ref, let's provide a way
to import them from such a ref back to the stash. This works much the
way the export code does, except that we strip off the first parent
chain commit and then store each resulting commit back to the stash.
We don't clear the stash first and instead add the specified stashes to
the top of the stash. This is because users may want to export just a
few stashes, such as to share a small amount of work in progress with a
colleague, and it would be undesirable for the receiving user to lose
all of their data. For users who do want to replace the stash, it's
easy to do to: simply run "git stash clear" first.
We specifically rely on the fact that we'll produce identical stash
commits on both sides in our tests. This provides a cheap,
straightforward check for our tests and also makes it easy for users to
see if they already have the same data in both repositories.
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-stash.adoc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Documentation/git-stash.adoc b/Documentation/git-stash.adoc index 0aef0a5b86..e5e6c9d37f 100644 --- a/Documentation/git-stash.adoc +++ b/Documentation/git-stash.adoc @@ -24,6 +24,7 @@ SYNOPSIS 'git stash' create [<message>] 'git stash' store [(-m | --message) <message>] [-q | --quiet] <commit> 'git stash' export (--print | --to-ref <ref>) [<stash>...] +'git stash' import <commit> DESCRIPTION ----------- @@ -161,6 +162,12 @@ export ( --print | --to-ref <ref> ) [<stash>...]:: a chain of commits which can be transferred using the normal fetch and push mechanisms, then imported using the `import` subcommand. +import <commit>:: + + Import the specified stashes from the specified commit, which must have been + created by `export`, and add them to the list of stashes. To replace the + existing stashes, use `clear` first. + OPTIONS ------- -a:: |