[PATCH v2 1/1] doc: format-patch: don't use origin as a branch name
- From
Philip Oakley <philipoakley@iee.org>
- Date
- Aug 2, 2014, 15:46 UTC
- Message-ID
- <1406994383-5076-2-git-send-email-philipoakley@iee.org>
- In-Reply-To
- <1406994383-5076-1-git-send-email-philipoakley@iee.org>
Historically (5 Nov 2005 v0.99.9-46-g28ffb89) the git-format-patch used 'origin' as the upstream branch name. That name is now used as the nominal name for the upstream remote.
While 'origin' would be DWIMmed (do what I mean) to be that remote's primary branch, do not assume the reader is ready for such magic.
Likewise, do not use 'origin/master' which may not be up to date with the remote, nor reflect the reader's master branch. The patch series should be relative to the reader's view of 'git show-branch HEAD master'.
Use the more modern 'master' as the reference branch name.
Signed-off-by: Philip Oakley <philipoakley@iee.org> --- Documentation/git-format-patch.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt index c0fd470..b0f041f 100644 --- a/Documentation/git-format-patch.txt +++ b/Documentation/git-format-patch.txt @@ -523,25 +523,25 @@ $ git format-patch -k --stdout R1..R2 | git am -3 -k ------------ * Extract all commits which are in the current branch but not in the -origin branch: +master branch: + ------------ -$ git format-patch origin +$ git format-patch master ------------ + For each commit a separate file is created in the current directory. -* Extract all commits that lead to 'origin' since the inception of the +* Extract all commits that lead to 'master' since the inception of the project: + ------------ -$ git format-patch --root origin +$ git format-patch --root master ------------ * The same as the previous one: + ------------ -$ git format-patch -M -B origin +$ git format-patch -M -B master ------------ + Additionally, it detects and handles renames and complete rewrites
-- 1.9.4.msysgit.0