From 48bb914ed641fc0880d86b16cbb17c84769c320a Mon Sep 17 00:00:00 2001 From: Jeff King Date: Fri, 11 Mar 2011 00:52:08 -0500 Subject: doc: drop author/documentation sections from most pages The point of these sections is generally to: 1. Give credit where it is due. 2. Give the reader an idea of where to ask questions or file bug reports. But they don't do a good job of either case. For (1), they are out of date and incomplete. A much more accurate answer can be gotten through shortlog or blame. For (2), the correct contact point is generally git@vger, and even if you wanted to cc the contact point, the out-of-date and incomplete fields mean you're likely sending to somebody useless. So let's drop the fields entirely from all manpages except git(1) itself. We already point people to the mailing list for bug reports there, and we can update the Authors section to give credit to the major contributors and point to shortlog and blame for more information. Each page has a "This is part of git" footer, so people can follow that to the main git manpage. --- Documentation/git-merge.txt | 9 --------- 1 file changed, 9 deletions(-) (limited to 'Documentation/git-merge.txt') diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index c1efaaa5c5..fb4c05b83f 100644 --- a/Documentation/git-merge.txt +++ b/Documentation/git-merge.txt @@ -312,15 +312,6 @@ linkgit:git-diff[1], linkgit:git-ls-files[1], linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mergetool[1] -Author ------- -Written by Junio C Hamano - - -Documentation --------------- -Documentation by Junio C Hamano and the git-list . - GIT --- Part of the linkgit:git[1] suite -- cgit v1.2.3 From 93e535a5b78c9861eca3e9371d1c3e5173c0ab02 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 23 Mar 2011 23:48:24 -0700 Subject: merge: merge with the default upstream branch without argument "git merge" without specifying any commit is a no-op by default. A new option merge.defaultupstream can be set to true to cause such an invocation of the command to merge the upstream branches configured for the current branch by using their last observed values stored in their remote tracking branches. Signed-off-by: Junio C Hamano --- Documentation/git-merge.txt | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'Documentation/git-merge.txt') diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index c1efaaa5c5..cc8f424bb7 100644 --- a/Documentation/git-merge.txt +++ b/Documentation/git-merge.txt @@ -11,7 +11,7 @@ SYNOPSIS [verse] 'git merge' [-n] [--stat] [--no-commit] [--squash] [-s ] [-X ] - [--[no-]rerere-autoupdate] [-m ] ... + [--[no-]rerere-autoupdate] [-m ] [...] 'git merge' HEAD ... 'git merge' --abort @@ -95,8 +95,13 @@ commit or stash your changes before running 'git merge'. ...:: Commits, usually other branch heads, to merge into our branch. - You need at least one . Specifying more than one - obviously means you are trying an Octopus. + Specifying more than one commit will create a merge with + more than two parents (affectionately called an Octopus merge). ++ +If no commit is given from the command line, and if `merge.defaultToUpstream` +configuration variable is set, merge the remote tracking branches +that the current branch is configured to use as its upstream. +See also the configuration section of this manual page. PRE-MERGE CHECKS -- cgit v1.2.3