diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-06-13 22:21:00 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-06-13 22:21:00 +0400 |
| commit | ce987457ca3db0c78d5e720f753adf210fd3dd65 (patch) | |
| tree | 046f8a309909cda113775f81e0d4bb08f2b1f658 /Documentation/config.txt | |
| parent | a9f80f3dd4dc68ec6e9898805ccac2bb44c563ab (diff) | |
| parent | 95a2618f60a61fae8097695255419f257f74dff9 (diff) | |
Merge branch 'wp/pretty-enhancement'
* wp/pretty-enhancement:
pretty: initialize new cmt_fmt_map to 0
pretty: add aliases for pretty formats
pretty: add infrastructure for commit format aliases
pretty: make it easier to add new formats
Diffstat (limited to 'Documentation/config.txt')
| -rw-r--r-- | Documentation/config.txt | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 85f763c4d0..7e2ae254b0 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1481,6 +1481,16 @@ pager.<cmd>:: it takes precedence over this option. To disable pagination for all commands, set `core.pager` or `GIT_PAGER` to `cat`. +pretty.<name>:: + Alias for a --pretty= format string, as specified in + linkgit:git-log[1]. Any aliases defined here can be used just + as the built-in pretty formats could. For example, + running `git config pretty.changelog "format:{asterisk} %H %s"` + would cause the invocation `git log --pretty=changelog` + to be equivalent to running `git log "--pretty=format:{asterisk} %H %s"`. + Note that an alias with the same name as a built-in format + will be silently ignored. + pull.octopus:: The default merge strategy to use when pulling multiple branches at once. |