diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-06-17 10:15:17 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-06-17 10:15:17 -0700 |
| commit | 6e0b1c60ad3e6067d5cae51a7dc36e58184accd5 (patch) | |
| tree | 030db59bb6a9b059c1cc968e80bcc6fd7dfcabfe /Documentation/git-merge-base.txt | |
| parent | Merge branch 'js/bundle-verify-require-object-store' (diff) | |
| parent | merge: refuse --commit with --squash (diff) | |
| download | tgif-6e0b1c60ad3e6067d5cae51a7dc36e58184accd5.tar.xz | |
Merge branch 'vv/merge-squash-with-explicit-commit'
"git merge --squash" is designed to update the working tree and the
index without creating the commit, and this cannot be countermanded
by adding the "--commit" option; the command now refuses to work
when both options are given.
* vv/merge-squash-with-explicit-commit:
merge: refuse --commit with --squash
Diffstat (limited to 'Documentation/git-merge-base.txt')
0 files changed, 0 insertions, 0 deletions