diff options
| author |  Stefan Beller <sbeller@google.com> | 2018-01-04 14:50:43 -0800 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-01-04 15:02:40 -0800 |
| commit | 5e505257f2651647c072f9c61fdc5dd52bbce8b2 (patch) | |
| tree | 57327f342244e20dbc8d1dc5f6932343eea13de4 /Documentation/git-merge-one-file.txt | |
| parent | diffcore: add a pickaxe option to find a specific blob (diff) | |
| download | tgif-5e505257f2651647c072f9c61fdc5dd52bbce8b2.tar.xz | |
diff: properly error out when combining multiple pickaxe options
In f506b8e8b5 (git log/diff: add -G<regexp> that greps in the patch text,
2010-08-23) we were hesitant to check if the user requests both -S and
-G at the same time. Now that the pickaxe family also offers --find-object,
which looks slightly more different than the former two, let's add a check
that those are not used at the same time.
Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge-one-file.txt')
0 files changed, 0 insertions, 0 deletions