Signed-off-by: Finn Arne Gangstad <finnag@xxxxxxx>
---
Documentation/config.txt | 4 ++--
Documentation/git-push.txt | 4 +---
builtin-push.c | 7 ++++---
3 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 50bc1d0..437216c 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1170,10 +1170,10 @@ push.default::
branch, or `origin` if no remote is configured. `origin` is also used
if you are not on any branch.
+
-* `nothing` do not push anything
+* `nothing` do not push anything. This is new the default value.
* `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 default value.
+ matching. This used to be the default value.
* `current` push the current branch to the branch it is tracking on
the remote
diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt
index cb7b3d2..149c1f0 100644
--- a/Documentation/git-push.txt
+++ b/Documentation/git-push.txt
@@ -64,9 +64,7 @@ the remote repository.
The special refspec `:` (or `{plus}:` to allow non-fast forward updates)
directs git to push "matching" branches: for every branch that exists on
the local side, the remote side is updated if a branch of the same name
-already exists on the remote side. This is the default operation mode
-if no explicit refspec is found (that is neither on the command line
-nor in any Push line of the corresponding remotes file---see below).
+already exists on the remote side.
--all::
Instead of naming each ref to push, specifies that all
diff --git a/builtin-push.c b/builtin-push.c
index 7ef499f..93f12a8 100644
--- a/builtin-push.c
+++ b/builtin-push.c
@@ -104,6 +104,10 @@ static void handle_default_push(struct remote *remote, int *flags)
warn_unconfigured_push();
/* fallthrough */
+ case PUSH_DEFAULT_NOTHING:
+ die("No refspec given, and none configured.");
+ break;
+
case PUSH_DEFAULT_MATCHING:
add_refspec(":");
break;
@@ -112,9 +116,6 @@ static void handle_default_push(struct remote *remote, int *flags)
setup_push_current(remote);
break;
- case PUSH_DEFAULT_NOTHING:
- die("No refspec given, and none configured.");
- break;
}
}
--
1.6.2.105.g6ff1f.dirty
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
