diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-06-24 20:48:35 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-06-24 20:48:35 (GMT) |
| commit | 8d8975aca7c2b031a2386cd8f266109a8c6e1973 (patch) | |
| tree | 478ec91418df2adce222d60abb14e935774713cb /Documentation/config.txt | |
| parent | 22d94a72b3c4fa7989c4827e84ebc364a200cd76 (diff) | |
| parent | 7e30944622573ebdf87beed057b098af7360234c (diff) | |
| download | git-8d8975aca7c2b031a2386cd8f266109a8c6e1973.zip git-8d8975aca7c2b031a2386cd8f266109a8c6e1973.tar.gz git-8d8975aca7c2b031a2386cd8f266109a8c6e1973.tar.bz2 | |
Merge branch 'mm/rm-coalesce-errors'
Give a single message followed by list of paths from "git rm" to
report multiple paths that cannot be removed.
* mm/rm-coalesce-errors:
rm: introduce advice.rmHints to shorten messages
rm: better error message on failure for multiple files
Diffstat (limited to 'Documentation/config.txt')
| -rw-r--r-- | Documentation/config.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 311fceb..1153585 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -199,6 +199,9 @@ advice.*:: amWorkDir:: Advice that shows the location of the patch file when linkgit:git-am[1] fails to apply it. + rmHints:: + In case of failure in the output of linkgit:git-rm[1], + show directions on how to proceed from the current state. -- core.fileMode:: |