git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH v4 6/7] pull: cleanup documentation

From
Felipe Contreras <felipe.contreras@gmail.com>
Date
Oct 12, 2013, 07:01 UTC
Message-ID
<1381561322-20059-5-git-send-email-felipe.contreras@gmail.com>
In-Reply-To
<1381561322-20059-1-git-send-email-felipe.contreras@gmail.com>

'origin/master' is very clear, no need to specify the 'remotes/' prefix, or babysit the user.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
 Documentation/git-pull.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt
index e09f004..6d55737 100644
--- a/Documentation/git-pull.txt
+++ b/Documentation/git-pull.txt
@@ -39,7 +39,7 @@ Assume the following history exists and the current branch is
 "`master`":
 
 ------------
-	  A---B---C master on origin
+	  A---B---C origin/master
 	 /
     D---E---F---G master
 ------------
@@ -51,7 +51,7 @@ result in a new commit along with the names of the two parent commits
 and a log message from the user describing the changes.
 
 ------------
-	  A---B---C remotes/origin/master
+	  A---B---C origin/master
 	 /         \
     D---E---F---G---H master
 ------------
-- 
1.8.4-fc
Previous: Felipe ContrerasNext: Felipe Contreras
Message 5 of 8 in “pull: add merge-ff-only option”
  1. 4/7 pull: add merge-ff-only optionFelipe Contreras, Oct 12, 2013
  2. 0/7 Reject non-ff pulls by defaultFelipe Contreras, Oct 12, 2013
  3. 3/7 pull: add --merge optionFelipe Contreras, Oct 12, 2013
  4. 5/7 pull: add warning on non-ff mergesFelipe Contreras, Oct 12, 2013
  5. 6/7 pull: cleanup documentationFelipe Contreras, Oct 12, 2013
  6. 2/7 pull: refactor $rebase variable into $modeFelipe Contreras, Oct 12, 2013
  7. 1/7 pull: rename pull.rename to pull.modeFelipe Contreras, Oct 12, 2013
  8. 7/7 pull: add documentation about non-ff mergesFelipe Contreras, Oct 12, 2013

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.