From f18b1c55e5b7478524c15685cd643555fc919f3f Mon Sep 17 00:00:00 2001 From: "J. Bruce Fields" <bfields@citi.umich.edu> Date: Fri, 21 Dec 2007 19:57:16 -0500 Subject: [PATCH 1/2] Documentation: fix remote.<name>.skipDefaultUpdate description Fix the subcommand name. Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu> --- Documentation/config.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/config.txt b/Documentation/config.txt index 83bc33c421..6f2343fbc0 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -658,7 +658,7 @@ remote.<name>.push:: remote.<name>.skipDefaultUpdate:: 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:: The default program to execute on the remote side when pushing. See From 57283291b55cdc4ab726231073450d185beb361a Mon Sep 17 00:00:00 2001 From: Gustaf Hendeby <hendeby@isy.liu.se> Date: Mon, 31 Dec 2007 14:31:35 +0100 Subject: [PATCH 2/2] Documentation/user-manual.txt: fix typo Signed-off-by: Gustaf Hendeby <hendeby@isy.liu.se> Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu> --- Documentation/user-manual.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt index 159de30e19..bee0d61ab7 100644 --- a/Documentation/user-manual.txt +++ b/Documentation/user-manual.txt @@ -74,7 +74,7 @@ version is called a <<def_commit,commit>>. Those snapshots aren't necessarily all arranged in a single line from 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. A single git repository can track development on multiple branches. It