diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-03-26 00:26:25 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-03-26 00:26:25 -0700 |
| commit | 2545c089e329d340a9bdec9f725fa737063dd7f6 (patch) | |
| tree | 04c86073e04ff56e3037e46aeef947c51d7d608a /Documentation | |
| parent | 0b3035fe15bfd1d1f7cfab71819cb2cf4fc40d61 (diff) | |
| parent | b2655cdae953d619d488b69b7d49e4204e5682dc (diff) | |
| download | git-2545c089e329d340a9bdec9f725fa737063dd7f6.tar.gz git-2545c089e329d340a9bdec9f725fa737063dd7f6.tar.xz | |
Merge branch 'fg/push-default'
* fg/push-default:
builtin-push.c: Fix typo: "anythig" -> "anything"
Display warning for default git push with no push.default config
New config push.default to decide default behavior for push
Conflicts:
Documentation/config.txt
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/RelNotes-1.6.3.txt | 7 | ||||
| -rw-r--r-- | Documentation/config.txt | 18 |
2 files changed, 25 insertions, 0 deletions
diff --git a/Documentation/RelNotes-1.6.3.txt b/Documentation/RelNotes-1.6.3.txt index 5860b515f..0d8260a84 100644 --- a/Documentation/RelNotes-1.6.3.txt +++ b/Documentation/RelNotes-1.6.3.txt @@ -22,6 +22,13 @@ branch pointed at by its HEAD, gets a large warning. You can choose what should happen upon such a push by setting the configuration variable receive.denyDeleteCurrent in the receiving repository. +In a future release, the default of "git push" without further +arguments might be changed. Currently, it will push all matching +refspecs to the current remote. A configuration variable push.default +has been introduced to select the default behaviour. To ease the +transition, a big warning is issued if this is not configured and a +git push without arguments is attempted. + Updates since v1.6.2 -------------------- diff --git a/Documentation/config.txt b/Documentation/config.txt index 12540b605..750675530 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1194,6 +1194,24 @@ pull.octopus:: pull.twohead:: The default merge strategy to use when pulling a single branch. +push.default:: + Defines the action git push should take if no refspec is given + on the command line, no refspec is configured in the remote, and + no refspec is implied by any of the options given on the command + line. ++ +The term `current remote` means the remote configured for the current +branch, or `origin` if no remote is configured. `origin` is also used +if you are not on any branch. Possible values are: ++ +* `nothing` do not push anything. +* `matching` push all matching branches to the current remote. + All branches having the same name in both ends are considered to be + matching. This is the current default value. +* `tracking` push the current branch to the branch it is tracking. +* `current` push the current branch to a branch of the same name on the + current remote. + rebase.stat:: Whether to show a diffstat of what changed upstream since the last rebase. False by default. |