diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-08-22 11:51:53 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-08-22 11:51:53 -0700 |
| commit | 64336ebe3413e07dcf9e0bcaba93884caab8d65d (patch) | |
| tree | 8d32558d72b7b36d2788aefe39228f1b6d7aee3a /merge-recursive.c | |
| parent | Merge branch 'tr/maint-send-email-2047' (diff) | |
| parent | setup: clarify error messages for file/revisions ambiguity (diff) | |
| download | git-64336ebe3413e07dcf9e0bcaba93884caab8d65d.tar.gz git-64336ebe3413e07dcf9e0bcaba93884caab8d65d.zip | |
Merge branch 'mm/die-with-dashdash-help'
When the user gives an argument that can be taken as both a revision
name and a pathname without disambiguating with "--", we used to
give a help message "Use '--' to separate". The message has been
clarified to show where that '--' goes on the command line.
* mm/die-with-dashdash-help:
setup: clarify error messages for file/revisions ambiguity
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions