-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
config.txt: move am.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
- Loading branch information
Showing
2 changed files
with
15 additions
and
14 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
am.keepcr:: | ||
If true, git-am will call git-mailsplit for patches in mbox format | ||
with parameter `--keep-cr`. In this case git-mailsplit will | ||
not remove `\r` from lines ending with `\r\n`. Can be overridden | ||
by giving `--no-keep-cr` from the command line. | ||
See linkgit:git-am[1], linkgit:git-mailsplit[1]. | ||
|
||
am.threeWay:: | ||
By default, `git am` will fail if the patch does not apply cleanly. When | ||
set to true, this setting tells `git am` to fall back on 3-way merge if | ||
the patch records the identity of blobs it is supposed to apply to and | ||
we have those blobs available locally (equivalent to giving the `--3way` | ||
option from the command line). Defaults to `false`. | ||
See linkgit:git-am[1]. |