diff options
| author |  Abhijit Menon-Sen <ams@toroid.org> | 2008-07-03 11:46:05 +0530 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2008-07-05 00:39:37 -0700 |
| commit | 656b50345239293929ad8c639c5f1941c6b867ad (patch) | |
| tree | 2ad9d58711dd3dc3bd5def98ccfa017f949ed102 /git-merge-octopus.sh | |
| parent | fast-export --export-marks: fix off by one error (diff) | |
| download | tgif-656b50345239293929ad8c639c5f1941c6b867ad.tar.xz | |
Implement "git stash branch <newbranch> <stash>"
Restores the stashed state on a new branch rooted at the commit on which
the stash was originally created, so that conflicts caused by subsequent
changes on the original branch can be dealt with.
(Thanks to Junio for this nice idea.)
Signed-off-by: Abhijit Menon-Sen <ams@toroid.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-octopus.sh')
0 files changed, 0 insertions, 0 deletions