diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-08-31 16:06:13 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-08-31 16:06:13 -0700 |
| commit | 3891e25205fcfcf3ed8583d096257f407ed4ef90 (patch) | |
| tree | a766001f024e1539582044939b61a436616a42b9 /config.txt | |
| parent | 5ef569ff27dfec295f3f21a67dfe6da55d667d06 (diff) | |
| download | git-htmldocs-3891e25205fcfcf3ed8583d096257f407ed4ef90.tar.gz | |
Autogenerated HTML docs for v2.5.1-454-g16163
Diffstat (limited to 'config.txt')
| -rw-r--r-- | config.txt | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/config.txt b/config.txt index f5d15fff3..0c351b9bc 100644 --- a/config.txt +++ b/config.txt @@ -1942,6 +1942,18 @@ mergetool.writeToTemp:: mergetool.prompt:: Prompt before each invocation of the merge resolution program. +notes.mergeStrategy:: + Which merge strategy to choose by default when resolving notes + conflicts. Must be one of `manual`, `ours`, `theirs`, `union`, or + `cat_sort_uniq`. Defaults to `manual`. See "NOTES MERGE STRATEGIES" + section of linkgit:git-notes[1] for more information on each strategy. + +notes.<name>.mergeStrategy:: + Which merge strategy to choose when doing a notes merge into + refs/notes/<name>. This overrides the more general + "notes.mergeStrategy". See the "NOTES MERGE STRATEGIES" section in + linkgit:git-notes[1] for more information on the available strategies. + notes.displayRef:: The (fully qualified) refname from which to show notes when showing commit messages. The value of this variable can be set @@ -1970,8 +1982,8 @@ notes.rewriteMode:: When copying notes during a rewrite (see the "notes.rewrite.<command>" option), determines what to do if the target commit already has a note. Must be one of - `overwrite`, `concatenate`, or `ignore`. Defaults to - `concatenate`. + `overwrite`, `concatenate`, `cat_sort_uniq`, or `ignore`. + Defaults to `concatenate`. + This setting can be overridden with the `GIT_NOTES_REWRITE_MODE` environment variable. @@ -2201,6 +2213,14 @@ push.followTags:: may override this configuration at time of push by specifying '--no-follow-tags'. +push.gpgSign:: + May be set to a boolean value, or the string 'if-asked'. A true + value causes all pushes to be GPG signed, as if '--signed' is + passed to linkgit:git-push[1]. The string 'if-asked' causes + pushes to be signed if the server supports it, as if + '--signed=if-asked' is passed to 'git push'. A false value may + override a value from a lower-priority config file. An explicit + command-line flag always overrides this config option. rebase.stat:: Whether to show a diffstat of what changed upstream since the last |