git/Documentation/git-push.txt, branch v1.8.2.2

Merge branch 'jc/maint-push-refspec-default-doc' into maint

2013-03-26T19:40:14Z

* jc/maint-push-refspec-default-doc: Documentation/git-push: clarify the description of defaults

Documentation/git-push: clarify the description of defaults

2013-03-08T17:55:08Z

We describe what gets pushed by default when the command line does not give any under the bullet point of . It is a bit unfriendly to expect users to read on when they are not giving any in the first place. "What gets pushed" is determined by taking many factors ( argument being only one of them) into account, and is a property of the entire command, not an individual argument. Also we do not describe "Where the push goes" when the command line does not say. Give the description on "what gets pushed to where" upfront before explaining individual arguments and options. Also update the description of to say what it is, what it is used for, before explaining what shape it takes. Signed-off-by: Junio C Hamano

Documentation: the name of the system is 'Git', not 'git'

2013-02-01T21:53:33Z

Signed-off-by: Thomas Ackermann Signed-off-by: Junio C Hamano

Merge branch 'cr/push-force-tag-update'

2013-01-06T07:41:34Z

Require "-f" for push to update a tag, even if it is a fast-forward. * cr/push-force-tag-update: push: allow already-exists advice to be disabled push: rename config variable for more general use push: cleanup push rules comment push: clarify rejection of update to non-commit-ish push: require force for annotated tags push: require force for refs under refs/tags/ push: flag updates that require force push: keep track of "update" state separately push: add advice for rejected tag reference push: return reject reasons as a bitset

push: require force for annotated tags

2012-12-02T09:44:49Z

Do not allow fast-forwarding of references that point to a tag object. Updating from a tag is potentially destructive since it would likely leave the tag dangling. Disallowing updates to a tag also makes sense semantically and is consistent with the behavior of lightweight tags. Signed-off-by: Chris Rorvick Signed-off-by: Junio C Hamano

push: require force for refs under refs/tags/

2012-12-02T09:44:34Z

References are allowed to update from one commit-ish to another if the former is an ancestor of the latter. This behavior is oriented to branches which are expected to move with commits. Tag references are expected to be static in a repository, though, thus an update to something under refs/tags/ should be rejected unless the update is forced. Signed-off-by: Chris Rorvick Signed-off-by: Junio C Hamano

Documentation/git-push.txt: clarify the "push from satellite" workflow

2012-11-28T06:39:08Z

The context of the example to push into refs/remotes/satellite/ hierarchy of the other repository needs to be spelled out explicitly for the value of this example to be fully appreciated. Make it so. Signed-off-by: Junio C Hamano

Documentation: improve phrasing in git-push.txt

2012-11-27T17:12:58Z

The current version contains the sentence: Further suppose that the other person already pushed changes leading to A back to the original repository you two obtained the original commit X. which doesn't parse for me; I've changed it to Further suppose that the other person already pushed changes leading to A back to the original repository from which you two obtained the original commit X. Signed-off-by: Mark Szepieniec Signed-off-by: Junio C Hamano

Merge branch 'mm/maint-doc-remote-tracking' into maint

2012-11-19T03:33:20Z

Update "remote tracking branch" in the documentation to "remote-tracking branch". * mm/maint-doc-remote-tracking: Documentation: remote tracking branch -> remote-tracking branch

Merge branch 'mm/maint-doc-remote-tracking'

2012-11-04T12:59:57Z

We long ago hyphenated "remote-tracking branch"; this catches some new instances added since then. * mm/maint-doc-remote-tracking: Documentation: remote tracking branch -> remote-tracking branch