mirror of
https://github.com/git/git.git
synced 2024-10-21 03:28:41 +02:00
6605fb70cb
The purpose of the new option is to accommodate users who would like --rebase-merges to be on by default and to facilitate turning on --rebase-merges by default without configuration in a future version of Git. Name the new option rebase.rebaseMerges, even though it is a little redundant, for consistency with the name of the command line option and to be clear when scrolling through values in the [rebase] section of .gitconfig. Support setting rebase.rebaseMerges to the nonspecific value "true" for users who don't need to or don't want to learn about the difference between rebase-cousins and no-rebase-cousins. Make --rebase-merges without an argument on the command line override any value of rebase.rebaseMerges in the configuration, for consistency with other command line flags with optional arguments that have an associated config option. Signed-off-by: Alex Henrie <alexhenrie24@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> |
||
|---|---|---|
| .. | ||
| add.txt | ||
| advice.txt | ||
| alias.txt | ||
| am.txt | ||
| apply.txt | ||
| blame.txt | ||
| branch.txt | ||
| browser.txt | ||
| bundle.txt | ||
| checkout.txt | ||
| clean.txt | ||
| clone.txt | ||
| color.txt | ||
| column.txt | ||
| commit.txt | ||
| commitgraph.txt | ||
| completion.txt | ||
| core.txt | ||
| credential.txt | ||
| diff.txt | ||
| difftool.txt | ||
| extensions.txt | ||
| fastimport.txt | ||
| feature.txt | ||
| fetch.txt | ||
| filter.txt | ||
| fmt-merge-msg.txt | ||
| format.txt | ||
| fsck.txt | ||
| fsmonitor--daemon.txt | ||
| gc.txt | ||
| gitcvs.txt | ||
| gitweb.txt | ||
| gpg.txt | ||
| grep.txt | ||
| gui.txt | ||
| guitool.txt | ||
| help.txt | ||
| http.txt | ||
| i18n.txt | ||
| imap.txt | ||
| includeif.txt | ||
| index.txt | ||
| init.txt | ||
| instaweb.txt | ||
| interactive.txt | ||
| log.txt | ||
| lsrefs.txt | ||
| mailinfo.txt | ||
| mailmap.txt | ||
| maintenance.txt | ||
| man.txt | ||
| merge.txt | ||
| mergetool.txt | ||
| notes.txt | ||
| pack.txt | ||
| pager.txt | ||
| pretty.txt | ||
| protocol.txt | ||
| pull.txt | ||
| push.txt | ||
| rebase.txt | ||
| receive.txt | ||
| remote.txt | ||
| remotes.txt | ||
| repack.txt | ||
| rerere.txt | ||
| revert.txt | ||
| safe.txt | ||
| sendemail.txt | ||
| sequencer.txt | ||
| showbranch.txt | ||
| sparse.txt | ||
| splitindex.txt | ||
| ssh.txt | ||
| stash.txt | ||
| status.txt | ||
| submodule.txt | ||
| tag.txt | ||
| tar.txt | ||
| trace2.txt | ||
| transfer.txt | ||
| uploadarchive.txt | ||
| uploadpack.txt | ||
| url.txt | ||
| user.txt | ||
| versionsort.txt | ||
| web.txt | ||
| worktree.txt | ||