diff options
author | Junio C Hamano <gitster@pobox.com> | 2012-05-02 13:51:24 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2012-05-02 13:51:24 -0700 |
commit | a3db8511b79c1a169c70caf07cedf21358101c60 (patch) | |
tree | 30833024bfe2acb6f13ca75c557ade5f567fcaac /Documentation/git-difftool.txt | |
parent | Merge branch 'jc/index-v4' (diff) | |
parent | push.default doc: explain simple after upstream (diff) | |
download | tgif-a3db8511b79c1a169c70caf07cedf21358101c60.tar.xz |
Merge branch 'mm/simple-push'
New users tend to work on one branch at a time and push the result
out. The current and upstream modes of push is a more suitable default
mode than matching mode for these people, but neither is surprise-free
depending on how the project is set up. Introduce a "simple" mode that
is a subset of "upstream" but only works when the branch is named the same
between the remote and local repositories.
The plan is to make it the new default when push.default is not
configured.
By Matthieu Moy (5) and others
* mm/simple-push:
push.default doc: explain simple after upstream
push: document the future default change for push.default (matching -> simple)
t5570: use explicit push refspec
push: introduce new push.default mode "simple"
t5528-push-default.sh: add helper functions
Undocument deprecated alias 'push.default=tracking'
Documentation: explain push.default option a bit more
Diffstat (limited to 'Documentation/git-difftool.txt')
0 files changed, 0 insertions, 0 deletions