git/Documentation, branch v2.3.5

Git 2.3.5

2015-03-31T21:57:10Z

Signed-off-by: Junio C Hamano

Merge branch 'ss/pull-rebase-preserve' into maint

2015-03-31T21:54:12Z

* ss/pull-rebase-preserve: docs: clarify what git-rebase's "-p" / "--preserve-merges" does docs: clarify "preserve" option wording for git-pull

Merge branch 'ph/push-doc-cas' into maint

2015-03-31T21:52:24Z

* ph/push-doc-cas: git-push.txt: clean up force-with-lease wording

docs: clarify what git-rebase's "-p" / "--preserve-merges" does

2015-03-30T20:44:29Z

Ignoring a merge can be read as ignoring the changes a merge commit introduces altogether, as if the entire side branch the merge commit merged was removed from the history. But that is not what happens if "-p" is not specified. What happens is that the individual commits a merge commit introduces are replayed in order, and only any possible merge conflict resolutions or manual amendments to the merge commit are ignored. Get this straight in the docs. Also, do not say that merge commits are *tried* to be recreated. As that is true almost everywhere it is better left unsaid. Signed-off-by: Sebastian Schuberth Signed-off-by: Junio C Hamano

Prepare for 2.3.5

2015-03-28T16:36:30Z

Signed-off-by: Junio C Hamano

Merge branch 'nd/doc-git-index-version' into maint

2015-03-28T16:33:13Z

Doc clean-up. * nd/doc-git-index-version: git.txt: list index versions in plain English

Merge branch 'jc/submitting-patches-mention-send-email' into maint

2015-03-28T16:33:10Z

Recommend format-patch and send-email for those who want to submit patches to this project. * jc/submitting-patches-mention-send-email: SubmittingPatches: encourage users to use format-patch and send-email

Merge branch 'jk/prune-with-corrupt-refs' into maint

2015-03-28T16:33:06Z

"git prune" used to largely ignore broken refs when deciding which objects are still being used, which could spread an existing small damage and make it a larger one. * jk/prune-with-corrupt-refs: refs.c: drop curate_packed_refs repack: turn on "ref paranoia" when doing a destructive repack prune: turn on ref_paranoia flag refs: introduce a "ref paranoia" flag t5312: test object deletion code paths in a corrupted repository

2.3.2 release notes: typofix

2015-03-28T16:29:29Z

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

docs: clarify "preserve" option wording for git-pull

2015-03-26T20:19:26Z

The "also" sounds as if "preserve" does a rebase as an additional step that "true" would not do, but that is not the case. Clarify this by omitting "also", and rewording the sentence a bit. Signed-off-by: Sebastian Schuberth Signed-off-by: Junio C Hamano