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

[PATCH] change 'commands' to comments and improve wording

From
AAdrian <forbesa06@gmail.com>
Date
May 27, 2017, 03:53 UTC
Message-ID
<0102015c4809f8c7-a5cb604c-782d-4a10-87e1-2fe23e9989ba-000000@eu-west-1.amazonses.com>
---
 Documentation/git-stash.txt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/Documentation/git-stash.txt b/Documentation/git-stash.txt
index 70191d06b69e..3899d36b2bab 100644
--- a/Documentation/git-stash.txt
+++ b/Documentation/git-stash.txt
@@ -233,7 +233,7 @@ return to your original branch to make the emergency fix, like this:
 $ git checkout -b my_wip
 $ git commit -a -m "WIP"
 $ git checkout master
-$ edit emergency fix
+# ... edit emergency fix ...
 $ git commit -a -m "Fix in a hurry"
 $ git checkout my_wip
 $ git reset --soft HEAD^
@@ -245,7 +245,7 @@ You can use 'git stash' to simplify the above, like this:
 ----------------------------------------------------------------
 # ... hack hack hack ...
 $ git stash
-$ edit emergency fix
+# ... edit emergency fix ...
 $ git commit -a -m "Fix in a hurry"
 $ git stash pop
 # ... continue hacking ...
@@ -261,11 +261,11 @@ each change before committing:
 # ... hack hack hack ...
 $ git add --patch foo            # add just first part to the index
 $ git stash save --keep-index    # save all other changes to the stash
-$ edit/build/test first part
+# ... edit, build and test first part ...
 $ git commit -m 'First part'     # commit fully tested change
 $ git stash pop                  # prepare to work on all other changes
 # ... repeat above five steps until one commit remains ...
-$ edit/build/test remaining parts
+# ... edit, build and test remaining parts ...
 $ git commit foo -m 'Remaining parts'
 ----------------------------------------------------------------
 

--
https://github.com/git/git/pull/361
Next: Junio C Hamano
Message 1 of 2 in “change 'commands' to comments and improve wording”
  1. change 'commands' to comments and improve wordingAdrian, May 27, 2017
  2. Junio C HamanoMay 29, 2017

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.