From: Junio C Hamano Date: Wed, 27 Mar 2013 17:51:10 +0000 (-0700) Subject: Merge branch 'maint-1.8.1' into maint X-Git-Tag: v1.8.2.1~29 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/d011ab4312a8ddabd143567fa9706b8e9fb9c0a4?ds=inline;hp=-c Merge branch 'maint-1.8.1' into maint * maint-1.8.1: merge-tree: fix typo in merge-tree.c::unresolved git-commit doc: describe use of multiple `-m` options git-pull doc: fix grammo ("conflicts" is plural) --- d011ab4312a8ddabd143567fa9706b8e9fb9c0a4 diff --combined Documentation/git-commit.txt index 0eb79ccdba,2105638191..42c22bb59d --- a/Documentation/git-commit.txt +++ b/Documentation/git-commit.txt @@@ -32,7 -32,7 +32,7 @@@ The content to be added can be specifie 3. by listing files as arguments to the 'commit' command, in which case the commit will ignore changes staged in the index, and instead record the current content of the listed files (which must already - be known to git); + be known to Git); 4. by using the -a switch with the 'commit' command to automatically "add" changes from all known files (i.e. all files that are already @@@ -59,7 -59,7 +59,7 @@@ OPTION --all:: Tell the command to automatically stage files that have been modified and deleted, but new files you have not - told git about are not affected. + told Git about are not affected. -p:: --patch:: @@@ -137,6 -137,8 +137,8 @@@ -m :: --message=:: Use the given as the commit message. + If multiple `-m` options are given, their values are + concatenated as separate paragraphs. -t :: --template=:: @@@ -179,9 -181,7 +181,9 @@@ only if the message is to be edited. Otherwise only whitespace removed. The 'verbatim' mode does not change message at all, 'whitespace' removes just leading/trailing whitespace lines - and 'strip' removes both whitespace and commentary. + and 'strip' removes both whitespace and commentary. The default + can be changed by the 'commit.cleanup' configuration variable + (see linkgit:git-config[1]). -e:: --edit:: @@@ -404,7 -404,7 +406,7 @@@ Though not required, it's a good idea t with a single short (less than 50 character) line summarizing the change, followed by a blank line and then a more thorough description. The text up to the first blank line in a commit message is treated -as the commit title, and that title is used throughout git. +as the commit title, and that title is used throughout Git. For example, linkgit:git-format-patch[1] turns a commit into email, and it uses the title on the Subject line and the rest of the commit in the body. diff --combined Documentation/git-pull.txt index c975743230,638456b68c..24ab07a3f8 --- a/Documentation/git-pull.txt +++ b/Documentation/git-pull.txt @@@ -59,8 -59,8 +59,8 @@@ and a log message from the user describ See linkgit:git-merge[1] for details, including how conflicts are presented and handled. -In git 1.7.0 or later, to cancel a conflicting merge, use -`git reset --merge`. *Warning*: In older versions of git, running 'git pull' +In Git 1.7.0 or later, to cancel a conflicting merge, use +`git reset --merge`. *Warning*: In older versions of Git, running 'git pull' with uncommitted changes is discouraged: while possible, it leaves you in a state that may be hard to back out of in the case of a conflict. @@@ -89,7 -89,7 +89,7 @@@ must be given before the options meant This option controls if new commits of all populated submodules should be fetched too (see linkgit:git-config[1] and linkgit:gitmodules[5]). That might be necessary to get the data needed for merging submodule - commits, a feature git learned in 1.7.3. Notice that the result of a + commits, a feature Git learned in 1.7.3. Notice that the result of a merge will not be checked out in the submodule, "git submodule update" has to be called afterwards to bring the work tree up to date with the merge result. @@@ -218,7 -218,7 +218,7 @@@ $ git merge origin/nex ------------------------------------------------ - If you tried a pull which resulted in a complex conflicts and + If you tried a pull which resulted in complex conflicts and would want to start over, you can recover with 'git reset'. @@@ -228,7 -228,7 +228,7 @@@ Using --recurse-submodules can only fet out submodules right now. When e.g. upstream added a new submodule in the just fetched commits of the superproject the submodule itself can not be fetched, making it impossible to check out that submodule later without -having to do a fetch again. This is expected to be fixed in a future git +having to do a fetch again. This is expected to be fixed in a future Git version. SEE ALSO