mirrors/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-08 10:13:18 +01:00
Code Activity
git/Documentation
History
Johannes Schindelin 4017761fd8 branch.autosetupmerge: allow boolean values, or "all" 
Junio noticed that switching on autosetupmerge unilaterally started
cluttering the config for local branches.  That is not the original
intention of branch.autosetupmerge, which was meant purely for
convenience when branching off of remote branches, but that semantics
got lost somewhere.

If you still want that "new" behavior, you can switch
branch.autosetupmerge to the value "all".  Otherwise, it is interpreted
as a boolean, which triggers setting up defaults _only_ when branching
off of a remote branch, i.e. the originally intended behavior.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2007-07-08 18:24:19 -07:00
..
howto War on whitespace 2007-06-07 00:04:01 -07:00
technical War on whitespace 2007-06-07 00:04:01 -07:00
.gitignore Ignore all man sections as they are generated files. 2007-04-23 22:19:36 -07:00
asciidoc.conf Merge branch 'maint' to sync with GIT 1.5.2.2 2007-06-16 01:22:10 -07:00
blame-options.txt Update -L documentation for git-blame/git-annotate 2007-04-26 22:43:10 -07:00
build-docdep.perl
callouts.xsl
cmd-list.perl Document git-filter-branch 2007-07-03 19:04:49 -07:00
config.txt branch.autosetupmerge: allow boolean values, or "all" 2007-07-08 18:24:19 -07:00
core-intro.txt Change "added.moved or removed" to "added, moved or removed" in 2007-07-06 18:56:34 -07:00
core-tutorial.txt War on whitespace 2007-06-07 00:04:01 -07:00
cvs-migration.txt
diff-format.txt diff: round down similarity index 2007-06-25 01:51:21 -07:00
diff-options.txt Add diff-option --ext-diff 2007-07-03 19:05:55 -07:00
diffcore.txt War on whitespace 2007-06-07 00:04:01 -07:00
docbook-xsl.css War on whitespace 2007-06-07 00:04:01 -07:00
everyday.txt
fetch-options.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-add.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-am.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-annotate.txt Update git-annotate/git-blame documentation 2007-04-16 01:14:46 -07:00
git-apply.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-archimport.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-archive.txt Make command description imperative statement, not third-person present. 2007-06-09 10:42:48 -07:00
git-bisect.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-blame.txt git-blame -w: ignore whitespace 2007-06-09 18:34:58 -07:00
git-branch.txt Documentation: minor cleanups to branch/checkout wording 2007-07-02 01:33:45 -07:00
git-bundle.txt Documentation: Added [verse] to SYNOPSIS where necessary 2007-05-18 21:47:40 -07:00
git-cat-file.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-check-attr.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-check-ref-format.txt
git-checkout-index.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-checkout.txt branch.autosetupmerge: allow boolean values, or "all" 2007-07-08 18:24:19 -07:00
git-cherry-pick.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-cherry.txt Merge branch 'maint' 2007-06-12 00:15:16 -07:00
git-citool.txt Document git-gui, git-citool as mainporcelain manual pages 2007-06-22 22:32:32 -07:00
git-clean.txt Fix minor documentation errors 2007-05-07 15:39:57 -07:00
git-clone.txt Add urls.txt to git-clone man page 2007-07-05 21:43:48 -07:00
git-commit-tree.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-commit.txt
git-config.txt config: add support for --bool and --int while setting values 2007-06-26 23:16:17 -07:00
git-convert-objects.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-count-objects.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-cvsexportcommit.txt Merge branch 'maint' to sync with GIT 1.5.2.2 2007-06-16 01:22:10 -07:00
git-cvsimport.txt Merge branch 'aw/cvs' 2007-06-12 21:04:52 -07:00
git-cvsserver.txt cvsserver: Actually implement --export-all 2007-06-15 22:38:48 -07:00
git-daemon.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-describe.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-diff-files.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-diff-index.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-diff-tree.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-diff.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-fast-import.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-fetch-pack.txt
git-fetch.txt Add urls.txt to git-clone man page 2007-07-05 21:43:48 -07:00
git-filter-branch.txt filter-branch documentation: clarify which filters are eval'ed 2007-07-05 22:12:42 -07:00
git-fmt-merge-msg.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-for-each-ref.txt Documentation: Reformatted SYNOPSIS for several commands 2007-05-18 21:47:45 -07:00
git-format-patch.txt Merge branch 'maint' 2007-07-03 22:56:59 -07:00
git-fsck-objects.txt
git-fsck.txt fsck --lost-found writes to subdirectories in .git/lost-found/ 2007-07-03 19:08:58 -07:00
git-gc.txt Fix minor grammatical typos in the git-gc man page 2007-05-31 16:22:28 -07:00
git-get-tar-commit-id.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-grep.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-gui.txt Document git-gui, git-citool as mainporcelain manual pages 2007-06-22 22:32:32 -07:00
git-hash-object.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-http-fetch.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-http-push.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-imap-send.txt
git-index-pack.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-init-db.txt Add an option to quiet git-init. 2007-06-27 22:22:17 -07:00
git-init.txt Add an option to quiet git-init. 2007-06-27 22:22:17 -07:00
git-instaweb.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-local-fetch.txt Mark disused commit walkers officially deprecated. 2007-07-02 23:29:54 -07:00
git-log.txt Document git log --full-diff 2007-06-16 13:10:52 -07:00
git-lost-found.txt Documentation: minor edits of git-lost-found manpage 2007-04-16 01:10:28 -07:00
git-ls-files.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-ls-remote.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-ls-tree.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-mailinfo.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-mailsplit.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-merge-base.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-merge-file.txt
git-merge-index.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-merge-one-file.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-merge-tree.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-merge.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-mergetool.txt [PATCH] git-mergetool: Allow gvimdiff to be used as a mergetool 2007-06-10 08:27:29 -04:00
git-mktag.txt mktag: minimally update the description. 2007-06-10 16:00:36 -07:00
git-mktree.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-mv.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-name-rev.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-p4import.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-pack-objects.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-pack-redundant.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-pack-refs.txt
git-parse-remote.txt
git-patch-id.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-peek-remote.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-prune-packed.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-prune.txt Merge branch 'maint' 2007-06-09 11:52:43 -07:00
git-pull.txt Add urls.txt to git-clone man page 2007-07-05 21:43:48 -07:00
git-push.txt Add urls.txt to git-clone man page 2007-07-05 21:43:48 -07:00
git-quiltimport.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-read-tree.txt Document git read-tree --trivial 2007-06-16 13:08:09 -07:00
git-rebase.txt Teach rebase -i about --preserve-merges 2007-06-26 18:58:59 -07:00
git-receive-pack.txt Documentation: quote {non-attributes} for asciidoc 2007-07-02 01:33:44 -07:00
git-reflog.txt Document git reflog --stale-fix 2007-06-16 13:08:12 -07:00
git-relink.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-remote.txt Merge branch 'maint' 2007-06-30 11:17:19 -07:00
git-repack.txt Merge branch 'maint' 2007-06-30 11:17:19 -07:00
git-repo-config.txt
git-request-pull.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-rerere.txt Enable "git rerere" by the config variable rerere.enabled 2007-07-06 22:39:15 -07:00
git-reset.txt Documentation/git-reset.txt: suggest git commit --amend in example. 2007-04-23 23:55:08 -07:00
git-rev-list.txt Documentation: quote {non-attributes} for asciidoc 2007-07-02 01:33:44 -07:00
git-rev-parse.txt Merge branch 'ei/worktree+filter' 2007-07-01 13:10:42 -07:00
git-revert.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-rm.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-runstatus.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-send-email.txt git-send-email: make options easier to configure. 2007-06-27 21:00:36 -07:00
git-send-pack.txt
git-sh-setup.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-shell.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-shortlog.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-show-branch.txt
git-show-index.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-show-ref.txt Documentation: show-ref: document --exclude-existing 2007-04-09 18:54:52 -07:00
git-show.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-ssh-fetch.txt Mark disused commit walkers officially deprecated. 2007-07-02 23:29:54 -07:00
git-ssh-upload.txt Mark disused commit walkers officially deprecated. 2007-07-02 23:29:54 -07:00
git-stash.txt Fix git-stash(1) markup. 2007-07-04 22:10:14 -07:00
git-status.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-stripspace.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-submodule.txt git-submodule(1): update description and key names 2007-07-06 22:39:23 -07:00
git-svn.txt git-svn: trailing slash in prefix is mandatory with --branches/-b 2007-06-24 02:37:40 -07:00
git-svnimport.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-symbolic-ref.txt
git-tag.txt Teach git-tag about showing tag annotations. 2007-06-02 20:04:14 -07:00
git-tar-tree.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-tools.txt
git-unpack-file.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-unpack-objects.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-update-index.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-update-ref.txt git-update-ref: add --no-deref option for overwriting/detaching ref 2007-05-10 15:24:44 -07:00
git-update-server-info.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-upload-archive.txt
git-upload-pack.txt
git-var.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-verify-pack.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-verify-tag.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-whatchanged.txt War on whitespace 2007-06-07 00:04:01 -07:00
git-write-tree.txt War on whitespace 2007-06-07 00:04:01 -07:00
git.txt Update public documentation links for 1.5.2.3 2007-07-02 01:14:00 -07:00
gitattributes.txt Use $Id$ as the ident attribute keyword rather than $ident$ to be consistent with other VCSs 2007-05-14 19:03:32 -07:00
gitignore.txt Create a new manpage for the gitignore format, and reference it elsewhere 2007-06-02 11:59:19 -07:00
gitk.txt War on whitespace 2007-06-07 00:04:01 -07:00
gitmodules.txt gitmodules(5): remove leading period from synopsis 2007-06-15 22:46:04 -07:00
glossary.txt glossary: add 'reflog' 2007-07-03 13:56:07 -07:00
hooks.txt Remove git-applypatch 2007-05-24 21:36:53 -07:00
howto-index.sh
i18n.txt
install-doc-quick.sh Rewrite "git-frotz" to "git frotz" 2007-07-02 22:52:14 -07:00
install-webdoc.sh
Makefile Change default man page path to /usr/share/man 2007-06-20 16:22:09 -07:00
merge-options.txt War on whitespace 2007-06-07 00:04:01 -07:00
merge-strategies.txt
pretty-formats.txt War on whitespace 2007-06-07 00:04:01 -07:00
pretty-options.txt Document git log --abbrev-commit, as a kind of pretty option 2007-06-16 13:10:49 -07:00
pull-fetch-param.txt War on whitespace 2007-06-07 00:04:01 -07:00
RelNotes-1.5.0.1.txt
RelNotes-1.5.0.2.txt
RelNotes-1.5.0.3.txt
RelNotes-1.5.0.4.txt War on whitespace 2007-06-07 00:04:01 -07:00
RelNotes-1.5.0.5.txt War on whitespace 2007-06-07 00:04:01 -07:00
RelNotes-1.5.0.6.txt War on whitespace 2007-06-07 00:04:01 -07:00
RelNotes-1.5.0.7.txt
RelNotes-1.5.0.txt
RelNotes-1.5.1.1.txt git-svn: don't allow globs to match regular files 2007-04-18 12:39:04 -07:00
RelNotes-1.5.1.2.txt GIT 1.5.1.2 2007-04-21 13:57:07 -07:00
RelNotes-1.5.1.3.txt War on whitespace 2007-06-07 00:04:01 -07:00
RelNotes-1.5.1.4.txt GIT v1.5.1.4 2007-05-08 22:11:17 -07:00
RelNotes-1.5.1.5.txt GIT 1.5.1.6 2007-05-20 00:15:53 -07:00
RelNotes-1.5.1.6.txt GIT 1.5.1.6 2007-05-20 00:15:53 -07:00
RelNotes-1.5.1.txt
RelNotes-1.5.2.1.txt GIT 1.5.2.1 2007-06-02 16:02:49 -07:00
RelNotes-1.5.2.2.txt GIT 1.5.2.2 2007-06-16 01:13:35 -07:00
RelNotes-1.5.2.3.txt GIT 1.5.2.3 2007-07-02 00:35:58 -07:00
RelNotes-1.5.2.txt GIT 1.5.2 2007-05-20 00:30:39 -07:00
RelNotes-1.5.3.txt Update draft Release Notes for 1.5.3 2007-07-03 19:04:38 -07:00
repository-layout.txt War on whitespace 2007-06-07 00:04:01 -07:00
SubmittingPatches War on whitespace 2007-06-07 00:04:01 -07:00
tutorial-2.txt tutorials: add user-manual links 2007-05-19 00:57:19 -04:00
tutorial.txt fix remote.origin.url in tutorial.txt 2007-07-05 22:44:26 -07:00
urls-remotes.txt Add urls.txt to git-clone man page 2007-07-05 21:43:48 -07:00
urls.txt Add urls.txt to git-clone man page 2007-07-05 21:43:48 -07:00
user-manual.conf
user-manual.txt Fixed a formulation mistake in Documentation/user-manual.txt 2007-07-06 10:49:12 -07:00