From 93ba78d6f4632ef1c5228965e3edc8c0faf88c1e Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Tue, 26 May 2020 00:06:52 +0100 Subject: revert(3p/git): Revert merge of git upstream at v2.26.2 This causes cgit to serve error pages, which is undesirable. This reverts commit 5229c9b232de5bfa959ad6ebbb4c8192ac513352, reversing changes made to f2b211131f2347342dde63975b09cf603149f1a3. --- third_party/git/Documentation/config/push.txt | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'third_party/git/Documentation/config/push.txt') diff --git a/third_party/git/Documentation/config/push.txt b/third_party/git/Documentation/config/push.txt index 0a7aa322a9be..0a0e000569d8 100644 --- a/third_party/git/Documentation/config/push.txt +++ b/third_party/git/Documentation/config/push.txt @@ -1,7 +1,6 @@ push.default:: Defines the action `git push` should take if no refspec is - given (whether from the command-line, config, or elsewhere). - Different values are well-suited for + explicitly given. Different values are well-suited for specific workflows; for instance, in a purely central workflow (i.e. the fetch source is equal to the push destination), `upstream` is probably what you want. Possible values are: @@ -9,7 +8,7 @@ push.default:: -- * `nothing` - do not push anything (error out) unless a refspec is - given. This is primarily meant for people who want to + explicitly given. This is primarily meant for people who want to avoid mistakes by always being explicit. * `current` - push the current branch to update a branch with the same @@ -80,7 +79,7 @@ higher priority configuration file (e.g. `.git/config` in a repository) to clear the values inherited from a lower priority configuration files (e.g. `$HOME/.gitconfig`). + ----- +-- Example: @@ -97,7 +96,7 @@ repo/.git/config This will result in only b (a and c are cleared). ----- +-- push.recurseSubmodules:: Make sure all submodule commits used by the revisions to be pushed -- cgit 1.4.1