diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-06-17 17:15:17 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-06-17 17:15:17 (GMT) |
| commit | 6e0b1c60ad3e6067d5cae51a7dc36e58184accd5 (patch) | |
| tree | 030db59bb6a9b059c1cc968e80bcc6fd7dfcabfe /fast-import.c | |
| parent | 3a54d80ac8a1decac6fa158175fb16f0563f5c15 (diff) | |
| parent | 1d14d0c9949c02260fe4f8b3a54a1b5c605823a2 (diff) | |
| download | git-6e0b1c60ad3e6067d5cae51a7dc36e58184accd5.zip git-6e0b1c60ad3e6067d5cae51a7dc36e58184accd5.tar.gz git-6e0b1c60ad3e6067d5cae51a7dc36e58184accd5.tar.bz2 | |
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 'fast-import.c')
0 files changed, 0 insertions, 0 deletions