undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Sync with 2.3.5

Browse Source 
* maint:
  Git 2.3.5
  docs: clarify what git-rebase's "-p" / "--preserve-merges" does
This commit is contained in:
Junio C Hamano 2015-03-31 14:58:38 -07:00
commit cf8a8c6bd5
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Documentation/RelNotes/2.3.5.txt
View File

@ -38,4 +38,7 @@ Fixes since v2.3.4
(in contrib/) did not spell ${param/pattern/string} substitution (in contrib/) did not spell ${param/pattern/string} substitution
correctly, which happened to work with bash but not with zsh. correctly, which happened to work with bash but not with zsh.
* The explanation on "rebase --preserve-merges", "pull --rebase=preserve",
and "push --force-with-lease" in the documentation was unclear.
Also contains typofixes, documentation updates and trivial code clean-ups. Also contains typofixes, documentation updates and trivial code clean-ups.

4
Documentation/git-rebase.txt
View File

@ -362,7 +362,9 @@ default is `--no-fork-point`, otherwise the default is `--fork-point`.
-p:: -p::
--preserve-merges:: --preserve-merges::
Instead of ignoring merges, try to recreate them. Recreate merge commits instead of flattening the history by replaying
commits a merge commit introduces. Merge conflict resolutions or manual
amendments to merge commits are not preserved.
+ +
This uses the `--interactive` machinery internally, but combining it This uses the `--interactive` machinery internally, but combining it
with the `--interactive` option explicitly is generally not a good with the `--interactive` option explicitly is generally not a good

3
Documentation/git.txt
View File

@ -43,9 +43,10 @@ unreleased) version of Git, that is available from the 'master'
branch of the `git.git` repository. branch of the `git.git` repository.
Documentation for older releases are available here: Documentation for older releases are available here:
* link:v2.3.4/git.html[documentation for release 2.3.4] * link:v2.3.5/git.html[documentation for release 2.3.5]
* release notes for * release notes for
link:RelNotes/2.3.5.txt[2.3.5],
link:RelNotes/2.3.4.txt[2.3.4], link:RelNotes/2.3.4.txt[2.3.4],
link:RelNotes/2.3.3.txt[2.3.3], link:RelNotes/2.3.3.txt[2.3.3],
link:RelNotes/2.3.2.txt[2.3.2], link:RelNotes/2.3.2.txt[2.3.2],