{"thread":{"id":"59692","subject":"[PATCH] doc: remove unnecessary newline from callouts","startedAt":"2023-05-03T23:51:35Z","lastAt":"2023-05-03T23:51:35Z","messageCount":1,"participants":["Felipe Contreras"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"476585","messageId":"20230503235126.71028-1-felipe.contreras@gmail.com","threadId":"59692","inReplyTo":null,"subject":"[PATCH] doc: remove unnecessary newline from callouts","fromName":"Felipe Contreras","fromEmail":"felipe.contreras@gmail.com","sentAt":"2023-05-03T23:51:26Z","receivedAt":"2023-05-03T23:51:35Z","isPatch":true,"sender":{"key":"felipe.contreras@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8358?v=4"},"body":"It was initially needed when the callouts were inside the listing, but\nafter 48aeecdcc1 (Fix up remaining man pages that use asciidoc\n\"callouts\"., 2006-04-28) moved them outside they are not needed.\n\nSome are already following this format, for example git-checkout.txt,\ngit-cherry-pick.txt, and howto/using-merge-subtree.txt.\n\nLet's be consistent and do the same everywhere.\n\nNo functional changes.\n\nSigned-off-by: Felipe Contreras <felipe.contreras@gmail.com>\n---\n Documentation/git-branch.txt       |  3 ---\n Documentation/git-diff.txt         |  5 -----\n Documentation/git-init.txt         |  1 -\n Documentation/git-reset.txt        | 10 ----------\n Documentation/git-restore.txt      |  1 -\n Documentation/git-update-index.txt |  1 -\n Documentation/giteveryday.txt      |  8 --------\n 7 files changed, 29 deletions(-)\n\ndiff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt\nindex d207da9101..9fcf766fbf 100644\n--- a/Documentation/git-branch.txt\n+++ b/Documentation/git-branch.txt\n@@ -359,7 +359,6 @@ $ cd my2.6\n $ git branch my2.6.14 v2.6.14   <1>\n $ git switch my2.6.14\n ------------\n-+\n <1> This step and the next one could be combined into a single step with\n     \"checkout -b my2.6.14 v2.6.14\".\n \n@@ -371,7 +370,6 @@ $ cd my.git\n $ git branch -d -r origin/todo origin/html origin/man   <1>\n $ git branch -D test                                    <2>\n ------------\n-+\n <1> Delete the remote-tracking branches \"todo\", \"html\" and \"man\". The next\n     'fetch' or 'pull' will create them again unless you configure them not to.\n     See linkgit:git-fetch[1].\n@@ -384,7 +382,6 @@ Listing branches from a specific remote::\n $ git branch -r -l '<remote>/<pattern>'                 <1>\n $ git for-each-ref 'refs/remotes/<remote>/<pattern>'    <2>\n ------------\n-+\n <1> Using `-a` would conflate <remote> with any local branches you happen to\n     have been prefixed with the same <remote> pattern.\n <2> `for-each-ref` can take a wide range of options. See linkgit:git-for-each-ref[1]\ndiff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt\nindex 52b679256c..fa8f28d5d3 100644\n--- a/Documentation/git-diff.txt\n+++ b/Documentation/git-diff.txt\n@@ -153,7 +153,6 @@ $ git diff            <1>\n $ git diff --cached   <2>\n $ git diff HEAD       <3>\n ------------\n-+\n <1> Changes in the working tree not yet staged for the next commit.\n <2> Changes between the index and your last commit; what you\n     would be committing if you run `git commit` without `-a` option.\n@@ -167,7 +166,6 @@ $ git diff test            <1>\n $ git diff HEAD -- ./test  <2>\n $ git diff HEAD^ HEAD      <3>\n ------------\n-+\n <1> Instead of using the tip of the current branch, compare with the\n     tip of \"test\" branch.\n <2> Instead of comparing with the tip of \"test\" branch, compare with\n@@ -182,7 +180,6 @@ $ git diff topic master    <1>\n $ git diff topic..master   <2>\n $ git diff topic...master  <3>\n ------------\n-+\n <1> Changes between the tips of the topic and the master branches.\n <2> Same as above.\n <3> Changes that occurred on the master branch since when the topic\n@@ -195,7 +192,6 @@ $ git diff --diff-filter=MRC            <1>\n $ git diff --name-status                <2>\n $ git diff arch/i386 include/asm-i386   <3>\n ------------\n-+\n <1> Show only modification, rename, and copy, but not addition\n     or deletion.\n <2> Show only names and the nature of change, but not actual\n@@ -208,7 +204,6 @@ Munging the diff output::\n $ git diff --find-copies-harder -B -C  <1>\n $ git diff -R                          <2>\n ------------\n-+\n <1> Spend extra cycles to find renames, copies and complete\n     rewrites (very expensive).\n <2> Output diff in reverse.\ndiff --git a/Documentation/git-init.txt b/Documentation/git-init.txt\nindex 160dea1372..401ae1bb99 100644\n--- a/Documentation/git-init.txt\n+++ b/Documentation/git-init.txt\n@@ -164,7 +164,6 @@ $ git init      <1>\n $ git add .     <2>\n $ git commit    <3>\n ----------------\n-+\n <1> Create a /path/to/my/codebase/.git directory.\n <2> Add all existing files to the index.\n <3> Record the pristine state as the first commit in the history.\ndiff --git a/Documentation/git-reset.txt b/Documentation/git-reset.txt\nindex 79ad5643ee..de8b84e930 100644\n--- a/Documentation/git-reset.txt\n+++ b/Documentation/git-reset.txt\n@@ -145,7 +145,6 @@ $ mailx                                    <2>\n $ git reset                                <3>\n $ git pull git://info.example.com/ nitfol  <4>\n ------------\n-+\n <1> You are happily working on something, and find the changes\n     in these files are in good order.  You do not want to see them\n     when you run `git diff`, because you plan to work on other files\n@@ -167,7 +166,6 @@ $ git reset --soft HEAD^      <1>\n $ edit                        <2>\n $ git commit -a -c ORIG_HEAD  <3>\n ------------\n-+\n <1> This is most often done when you remembered what you\n     just committed is incomplete, or you misspelled your commit\n     message, or both.  Leaves working tree as it was before \"reset\".\n@@ -185,7 +183,6 @@ $ git branch topic/wip          <1>\n $ git reset --hard HEAD~3       <2>\n $ git switch topic/wip          <3>\n ------------\n-+\n <1> You have made some commits, but realize they were premature\n     to be in the `master` branch.  You want to continue polishing\n     them in a topic branch, so create `topic/wip` branch off of the\n@@ -199,7 +196,6 @@ Undo commits permanently::\n $ git commit ...\n $ git reset --hard HEAD~3   <1>\n ------------\n-+\n <1> The last three commits (`HEAD`, `HEAD^`, and `HEAD~2`) were bad\n     and you do not want to ever see them again.  Do *not* do this if\n     you have already given these commits to somebody else.  (See the\n@@ -219,7 +215,6 @@ Updating from 41223... to 13134...\n Fast-forward\n $ git reset --hard ORIG_HEAD       <4>\n ------------\n-+\n <1> Try to update from the upstream resulted in a lot of\n     conflicts; you were not ready to spend a lot of time merging\n     right now, so you decide to do that later.\n@@ -244,7 +239,6 @@ Merge made by recursive.\n  ...\n $ git reset --merge ORIG_HEAD      <2>\n ------------\n-+\n <1> Even if you may have local modifications in your\n     working tree, you can safely say `git pull` when you know\n     that the change in the other branch does not overlap with\n@@ -274,7 +268,6 @@ $ git switch feature\n $ git reset --soft HEAD^ ;# go back to WIP state  <2>\n $ git reset                                       <3>\n ------------\n-+\n <1> This commit will get blown away so a throw-away log message is OK.\n <2> This removes the 'WIP' commit from the commit history, and sets\n     your working tree to the state just before you made that snapshot.\n@@ -295,7 +288,6 @@ $ git reset -- frotz.c                      <1>\n $ git commit -m \"Commit files in index\"     <2>\n $ git add frotz.c                           <3>\n ------------\n-+\n <1> This removes the file from the index while keeping it in the working\n     directory.\n <2> This commits all other changes in the index.\n@@ -318,7 +310,6 @@ $ edit\n $ git switch -c branch2                     <2>\n $ git reset --keep start                    <3>\n ------------\n-+\n <1> This commits your first edits in `branch1`.\n <2> In the ideal world, you could have realized that the earlier\n     commit did not belong to the new topic when you created and switched\n@@ -346,7 +337,6 @@ $ git add ...                               <6>\n $ git diff --cached                         <7>\n $ git commit ...                            <8>\n ------------\n-+\n <1> First, reset the history back one commit so that we remove the original\n     commit, but leave the working tree with all the changes. The -N ensures\n     that any new files added with `HEAD` are still marked so that `git add -p`\ndiff --git a/Documentation/git-restore.txt b/Documentation/git-restore.txt\nindex 5964810caa..9d34dbe8a4 100644\n--- a/Documentation/git-restore.txt\n+++ b/Documentation/git-restore.txt\n@@ -159,7 +159,6 @@ $ git restore --source master~2 Makefile  <1>\n $ rm -f hello.c\n $ git restore hello.c                     <2>\n ------------\n-\n <1> take a file out of another commit\n <2> restore hello.c from the index\n \ndiff --git a/Documentation/git-update-index.txt b/Documentation/git-update-index.txt\nindex f4bb9c5daf..40396e23f3 100644\n--- a/Documentation/git-update-index.txt\n+++ b/Documentation/git-update-index.txt\n@@ -381,7 +381,6 @@ $ git update-index --no-assume-unchanged foo.c   <8>\n $ git diff --name-only                           <9>\n M foo.c\n ------------\n-+\n <1> forces lstat(2) to set \"assume unchanged\" bits for paths that match index.\n <2> mark the path to be edited.\n <3> this does lstat(2) and finds index matches the path.\ndiff --git a/Documentation/giteveryday.txt b/Documentation/giteveryday.txt\nindex faba2ef088..a897ad71d9 100644\n--- a/Documentation/giteveryday.txt\n+++ b/Documentation/giteveryday.txt\n@@ -72,7 +72,6 @@ $ git add . <1>\n $ git commit -m \"import of frotz source tree.\"\n $ git tag v2.43 <2>\n ------------\n-+\n <1> add everything under the current directory.\n <2> make a lightweight, unannotated tag.\n \n@@ -94,7 +93,6 @@ $ git merge alsa-audio <9>\n $ git log --since='3 days ago' <10>\n $ git log v2.43.. curses/ <11>\n ------------\n-+\n <1> create a new topic branch.\n <2> revert your botched changes in `curses/ux_audio_oss.c`.\n <3> you need to tell Git if you added a new file; removal and\n@@ -159,7 +157,6 @@ $ git pull git://git.kernel.org/pub/.../jgarzik/libata-dev.git ALL <9>\n $ git reset --hard ORIG_HEAD <10>\n $ git gc <11>\n ------------\n-+\n <1> checkout a new branch `mine` from master.\n <2> repeat as needed.\n <3> extract patches from your branch, relative to master,\n@@ -196,7 +193,6 @@ mothership$ cd frotz\n mothership$ git switch master\n mothership$ git merge satellite/master <5>\n ------------\n-+\n <1> mothership machine has a frotz repository under your home\n directory; clone from it to start a repository on the satellite\n machine.\n@@ -220,7 +216,6 @@ $ edit/compile/test; git commit -a\n $ git checkout master\n $ git cherry-pick v2.6.14..private2.6.14 <2>\n ------------\n-+\n <1> create a private branch based on a well known (but somewhat behind)\n tag.\n <2> forward port all changes in `private2.6.14` branch to `master` branch\n@@ -290,7 +285,6 @@ $ git fetch ko && for branch in master maint next seen <11>\n     done\n $ git push --follow-tags ko <13>\n ------------\n-+\n <1> see what you were in the middle of doing, if anything.\n <2> see which branches haven't been merged into `master` yet.\n Likewise for any other integration branches e.g. `maint`, `next`\n@@ -410,7 +404,6 @@ david:x:1003:1003::/home/david:/usr/bin/git-shell\n $ grep git /etc/shells <2>\n /usr/bin/git-shell\n ------------\n-+\n <1> log-in shell is set to /usr/bin/git-shell, which does not\n allow anything but `git push` and `git pull`.  The users require\n ssh access to the machine.\n@@ -441,7 +434,6 @@ refs/heads/master\talice\\|cindy\n refs/heads/doc-update\tbob\n refs/tags/v[0-9]*\tdavid\n ------------\n-+\n <1> place the developers into the same git group.\n <2> and make the shared repository writable by the group.\n <3> use update-hook example by Carl from Documentation/howto/\n-- \n2.40.0+fc1\n\n"}]}