From: Junio C Hamano Date: Tue, 31 Mar 2015 21:58:38 +0000 (-0700) Subject: Sync with 2.3.5 X-Git-Tag: v2.4.0-rc1~2 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/cf8a8c6bd53c43e29cb735eb7934ffc996475d77?hp=-c Sync with 2.3.5 * maint: Git 2.3.5 docs: clarify what git-rebase's "-p" / "--preserve-merges" does --- cf8a8c6bd53c43e29cb735eb7934ffc996475d77 diff --combined Documentation/git-rebase.txt index d728030590,c8ab48d6aa..47984e84ed --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@@ -207,10 -207,10 +207,10 @@@ rebase.stat: Whether to show a diffstat of what changed upstream since the last rebase. False by default. -rebase.autosquash:: +rebase.autoSquash:: If set to true enable '--autosquash' option by default. -rebase.autostash:: +rebase.autoStash:: If set to true enable '--autostash' option by default. OPTIONS @@@ -362,7 -362,9 +362,9 @@@ default is `--no-fork-point`, otherwis -p:: --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 with the `--interactive` option explicitly is generally not a good @@@ -414,7 -416,7 +416,7 @@@ squash/fixup series This option is only valid when the '--interactive' option is used. + If the '--autosquash' option is enabled by default using the -configuration variable `rebase.autosquash`, this option can be +configuration variable `rebase.autoSquash`, this option can be used to override and disable this setting. --[no-]autostash:: diff --combined Documentation/git.txt index 8837862908,8f5220ce47..59e8335055 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@@ -43,9 -43,10 +43,10 @@@ unreleased) version of Git, that is ava branch of the `git.git` repository. 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 + link:RelNotes/2.3.5.txt[2.3.5], link:RelNotes/2.3.4.txt[2.3.4], link:RelNotes/2.3.3.txt[2.3.3], link:RelNotes/2.3.2.txt[2.3.2], @@@ -921,7 -922,7 +922,7 @@@ for further details If this environment variable is set, then Git commands which need to acquire passwords or passphrases (e.g. for HTTP or IMAP authentication) will call this program with a suitable prompt as command-line argument - and read the password from its STDOUT. See also the 'core.askpass' + and read the password from its STDOUT. See also the 'core.askPass' option in linkgit:git-config[1]. 'GIT_TERMINAL_PROMPT'::