diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-07-25 14:27:10 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-07-25 14:27:10 -0700 |
| commit | 33f2790ecafd29b8551a290e566003b975807c61 (patch) | |
| tree | 1fb01d503bc1847a14b4e21cb5cb0a010f9c84ae /builtin/commit-graph.c | |
| parent | abbd50428e1215933f83a458f2842f5a6e0a21ee (diff) | |
| parent | 1d14d0c9949c02260fe4f8b3a54a1b5c605823a2 (diff) | |
Merge branch 'vv/merge-squash-with-explicit-commit' into maint
"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 'builtin/commit-graph.c')
0 files changed, 0 insertions, 0 deletions