diff options
| author |  Sergey Organov <sorganov@gmail.com> | 2020-12-21 18:19:50 +0300 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2020-12-21 13:47:31 -0800 |
| commit | 255a4dacc59f4f4f62cc61743f40a078b4b38647 (patch) | |
| tree | 5326feccb7bec4478378d977282a8774efad380f /Documentation/git-restore.txt | |
| parent | diff-merges: refactor opt settings into separate functions (diff) | |
| download | tgif-255a4dacc59f4f4f62cc61743f40a078b4b38647.tar.xz | |
diff-merges: make -m/-c/--cc explicitly mutually exclusive
-c/--cc got precedence over -m only because of external logic where
corresponding flags are checked before that for -m. This is too
error-prone, so add code that explicitly makes these 3 options
mutually exclusive, so that the last option specified on the
command-line gets precedence.
Signed-off-by: Sergey Organov <sorganov@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-restore.txt')
0 files changed, 0 insertions, 0 deletions