delta/git.git/Documentation/git-am.txt, branch pm/build-persistent-https-with-recent-go

Merge branch 'mm/keyid-docs' into maint

2015-10-16T21:32:33+00:00

Very small number of options take a parameter that is optional
(which is not a great UI element as they can only appear at the end
of the command line).  Add notice to documentation of each and
every one of them.

* mm/keyid-docs:
  Documentation: explain optional arguments better
  Documentation/grep: fix documentation of -O
  Documentation: use 'keyid' consistently, not 'key-id'

Documentation: explain optional arguments better

2015-09-21T17:48:23+00:00

Improve the documentation of commands taking optional arguments in two
ways:

* Documents the behavior of '-O' (for grep) and '-S' (for commands
  creating commits) when used without the optional argument.

* Document the syntax of these options.

For the second point, the behavior is documented in gitcli(7), but it is
easy for users to miss, and hard for the same user to understand why e.g.
"git status -u no" does not work.

Document this explicitly in the documentation of each short option having
an optional argument: they are the most error prone since there is no '='
sign between the option and its argument.

Signed-off-by: Matthieu Moy 
Reviewed-by: Jeff King 
Signed-off-by: Junio C Hamano

git-am: add am.threeWay config variable

2015-08-05T05:02:11+00:00

Add the am.threeWay configuration variable to use the -3 or --3way
option of git am by default. When am.threeway is set and not desired
for a specific git am command, the --no-3way option can be used to
override it.

Signed-off-by: Remi Lespinet 
Signed-off-by: Paul Tan 
Signed-off-by: Junio C Hamano

Revert "git-am: add am.threeWay config variable"

2015-07-24T17:55:24+00:00

This reverts commit d96a275b91bae1800cd43be0651e886e7e042a17.

It used to be possible to apply a patch series with "git am mbox"
and then only after seeing a failure, switch to three-way mode via
"git am -3" (no other options or arguments).  The commit being
reverted broke this workflow.

Signed-off-by: Junio C Hamano

git-am: add am.threeWay config variable

2015-06-04T17:42:41+00:00

Add the am.threeWay configuration variable to use the -3 or --3way
option of git am by default. When am.threeway is set and not desired
for a specific git am command, the --no-3way option can be used to
override it.

Signed-off-by: Remi Lespinet 
Signed-off-by: Junio C Hamano

Merge branch 'mm/am-c-doc'

2015-03-05T20:45:40+00:00

The configuration variable 'mailinfo.scissors' was hard to
discover in the documentation.

* mm/am-c-doc:
  Documentation/git-am.txt: mention mailinfo.scissors config variable
  Documentation/config.txt: document mailinfo.scissors

Documentation/git-am.txt: mention mailinfo.scissors config variable

2015-02-20T23:09:23+00:00

It was already documented, but the user had to follow the link to
git-mailinfo.txt to find it.

Signed-off-by: Matthieu Moy 
Signed-off-by: Junio C Hamano

Merge branch 'rw/apply-does-not-take-ignore-date'

2014-12-22T20:27:55+00:00

* rw/apply-does-not-take-ignore-date:
  git-am.txt: --ignore-date flag is not passed to git-apply

git-am.txt: --ignore-date flag is not passed to git-apply

2014-12-09T22:25:53+00:00

Signed-off-by: Ronald Wampler 
Signed-off-by: Junio C Hamano

git-am: add --message-id/--no-message-id

2014-11-25T23:27:01+00:00

Parse the option and pass it directly to git-mailinfo.

Signed-off-by: Paolo Bonzini 
Signed-off-by: Junio C Hamano