kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'maint' of git://linux-nfs.org/~bfields/git 

* 'maint' of git://linux-nfs.org/~bfields/git:
  Documentation/user-manual.txt: fix typo
  Documentation: fix remote.<name>.skipDefaultUpdate description
maint
Junio C Hamano 2007-12-31 09:23:55 -08:00
parent ab11903225 57283291b5
commit c477553b2f
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/config.txt
View File

@ -757,7 +757,7 @@ remote.<name>.push::


remote.<name>.skipDefaultUpdate:: remote.<name>.skipDefaultUpdate::
If true, this remote will be skipped by default when updating If true, this remote will be skipped by default when updating
using the remote subcommand of gitlink:git-remote[1]. using the update subcommand of gitlink:git-remote[1].


remote.<name>.receivepack:: remote.<name>.receivepack::
The default program to execute on the remote side when pushing. See The default program to execute on the remote side when pushing. See

2
Documentation/user-manual.txt
View File

@ -74,7 +74,7 @@ version is called a <<def_commit,commit>>.


Those snapshots aren't necessarily all arranged in a single line from Those snapshots aren't necessarily all arranged in a single line from
oldest to newest; instead, work may simultaneously proceed along oldest to newest; instead, work may simultaneously proceed along
parallel lines of development, called <def_branch,branches>>, which may parallel lines of development, called <<def_branch,branches>>, which may
merge and diverge. merge and diverge.


A single git repository can track development on multiple branches. It A single git repository can track development on multiple branches. It