mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

Browse Source 
* maint:
  Documentation/config.txt: Mention branch.<name>.rebase applies to "git pull"
  doc: clarify definition of "update" for git-add -u
This commit is contained in:
Junio C Hamano 2008-05-08 20:50:03 -07:00
commit 1f8115b113
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Documentation/config.txt
View File

@ -426,7 +426,8 @@ branch.<name>.mergeoptions::
branch.<name>.rebase:: branch.<name>.rebase::
When true, rebase the branch <name> on top of the fetched branch, When true, rebase the branch <name> on top of the fetched branch,
instead of merging the default branch from the default remote. instead of merging the default branch from the default remote when
"git pull" is run.
*NOTE*: this is a possibly dangerous operation; do *not* use *NOTE*: this is a possibly dangerous operation; do *not* use
it unless you understand the implications (see linkgit:git-rebase[1] it unless you understand the implications (see linkgit:git-rebase[1]
for details). for details).

4
Documentation/git-add.txt
View File

@ -71,7 +71,9 @@ OPTIONS
the specified filepatterns before exiting. the specified filepatterns before exiting.
-u:: -u::
Update only files that git already knows about. This is similar Update only files that git already knows about, staging modified
content for commit and marking deleted files for removal. This
is similar
to what "git commit -a" does in preparation for making a commit, to what "git commit -a" does in preparation for making a commit,
except that the update is limited to paths specified on the except that the update is limited to paths specified on the
command line. If no paths are specified, all tracked files in the command line. If no paths are specified, all tracked files in the