From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 12 Aug 2015 21:09:55 +0000 (-0700)
Subject: Merge branch 'pt/am-builtin'
X-Git-Tag: v2.6.0-rc0~77
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/7aa2da616208a51ec51ce3639fe6abd9631b74db?hp=-c

Merge branch 'pt/am-builtin'

Rewrite "am" in "C".

* pt/am-builtin: (46 commits)
git-am: add am.threeWay config variable
builtin-am: remove redirection to git-am.sh
builtin-am: check for valid committer ident
builtin-am: implement legacy -b/--binary option
builtin-am: implement -i/--interactive
builtin-am: support and auto-detect mercurial patches
builtin-am: support and auto-detect StGit series files
builtin-am: support and auto-detect StGit patches
builtin-am: rerere support
builtin-am: invoke post-applypatch hook
builtin-am: invoke pre-applypatch hook
builtin-am: invoke applypatch-msg hook
builtin-am: support automatic notes copying
builtin-am: invoke post-rewrite hook
builtin-am: implement -S/--gpg-sign, commit.gpgsign
builtin-am: implement --committer-date-is-author-date
builtin-am: implement --ignore-date
builtin-am: pass git-apply's options to git-apply
builtin-am: implement --[no-]scissors
builtin-am: support --keep-cr, am.keepcr
...
---

7aa2da616208a51ec51ce3639fe6abd9631b74db
diff --combined Documentation/config.txt
index da74ad0d0a,fb3fc57911..1a8a399dd3
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@@ -769,6 -769,14 +769,14 @@@ am.keepcr:
  	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].
+ 
  apply.ignoreWhitespace::
  	When set to 'change', tells 'git apply' to ignore changes in
  	whitespace, in the same way as the '--ignore-space-change'
@@@ -1302,12 -1310,12 +1310,12 @@@ gc.pruneExpire:
  	"now" may be used to disable this  grace period and always prune
  	unreachable objects immediately.
  
 -gc.pruneWorktreesExpire::
 -	When 'git gc' is run, it will call
 -	'prune --worktrees --expire 3.months.ago'.
 -	Override the grace period with this config variable. The value
 -	"now" may be used to disable the grace period and prune
 -	$GIT_DIR/worktrees immediately.
 +gc.worktreePruneExpire::
 +	When 'git gc' is run, it calls
 +	'git worktree prune --expire 3.months.ago'.
 +	This config variable can be used to set a different grace
 +	period. The value "now" may be used to disable the grace
 +	period and prune $GIT_DIR/worktrees immediately.
  
  gc.reflogExpire::
  gc.<pattern>.reflogExpire::