diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-02-15 14:56:41 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-02-15 14:56:41 -0800 |
| commit | 57f7345b50d3b546ad3f7f07306f1402a00c581b (patch) | |
| tree | 4c53b064feabb7b9561ae39d21fe520c00381d1b /Documentation/merge-strategies.txt | |
| parent | Merge branch 'jk/doc-submodule-markup-fix' (diff) | |
| parent | Documentation/stash: remove mention of git reset --hard (diff) | |
| download | tgif-57f7345b50d3b546ad3f7f07306f1402a00c581b.tar.xz | |
Merge branch 'tg/stash-doc-cleanup'
The documentation explained what "git stash" does to the working
tree (after stashing away the local changes) in terms of "reset
--hard", which was exposing an unnecessary implementation detail.
* tg/stash-doc-cleanup:
Documentation/stash: remove mention of git reset --hard
Diffstat (limited to 'Documentation/merge-strategies.txt')
0 files changed, 0 insertions, 0 deletions