microsoft
/
git
зеркало из https://github.com/microsoft/git.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Merge branch 'sg/doc-pretty-formats' into maint 

Doc update.

* sg/doc-pretty-formats:
  docs/pretty-formats: stress that %- removes all preceding line-feeds
This commit is contained in:
Junio C Hamano 2017-06-24 15:29:35 -07:00
Родитель 77bcac3e72 8abc09c0e3
Коммит 74567ac001
1 изменённых файлов: 2 добавлений и 2 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

4
Documentation/pretty-formats.txt
Просмотреть файл

@ -213,8 +213,8 @@ If you add a `+` (plus sign) after '%' of a placeholder, a line-feed
is inserted immediately before the expansion if and only if the is inserted immediately before the expansion if and only if the
placeholder expands to a non-empty string. placeholder expands to a non-empty string.
If you add a `-` (minus sign) after '%' of a placeholder, line-feeds that If you add a `-` (minus sign) after '%' of a placeholder, all consecutive
immediately precede the expansion are deleted if and only if the line-feeds immediately preceding the expansion are deleted if and only if the
placeholder expands to an empty string. placeholder expands to an empty string.
If you add a ` ` (space) after '%' of a placeholder, a space If you add a ` ` (space) after '%' of a placeholder, a space