git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Jean-Noël Avila via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: "Martin Ågren" <martin.agren@gmail.com>,
	"Jean-Noël Avila" <jn.avila@free.fr>
Subject: [PATCH v2 0/7] doc: convert git-reset, git-rm and git-mv to new documentation format
Date: Sat, 12 Apr 2025 12:20:43 +0000	[thread overview]
Message-ID: <pull.1896.v2.git.1744460450.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.1896.git.1743354964.gitgitgadget@gmail.com>

doc: convert git-reset, git-rm and git-mv to new documentation format

change since V1:

 * fix remarks from reviewers
 * stack the commit fixing the handling of three-dot notation

Jean-Noël Avila (7):
  doc: convert git-reset to new documentation format
  doc: fix synopsis analysis logic
  doc: convert git-rm to new documentation format
  doc: move synopsis git-mv commands in the synopsis section
  doc: convert git-mv to new documentation format
  doc: fix asciidoctor synopsis processing of triple-dots
  doc: add markup for characters in Guidelines

 Documentation/CodingGuidelines             |  3 +
 Documentation/asciidoc.conf.in             |  8 +-
 Documentation/asciidoctor-extensions.rb.in | 12 +--
 Documentation/git-mv.adoc                  | 33 ++++----
 Documentation/git-reset.adoc               | 98 +++++++++++-----------
 Documentation/git-rm.adoc                  | 56 ++++++-------
 builtin/mv.c                               |  3 +-
 7 files changed, 109 insertions(+), 104 deletions(-)


base-commit: 485f5f863615e670fd97ae40af744e14072cfe18
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1896%2Fjnavila%2Fdoc_git_reset-v2
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1896/jnavila/doc_git_reset-v2
Pull-Request: https://github.com/gitgitgadget/git/pull/1896

Range-diff vs v1:

 1:  1676b5ac628 ! 1:  5a6c7def260 doc: convert git-reset to new documentation format
     @@ Documentation/git-reset.adoc: and specifying a commit with `--source`, you
      +`--soft`::
       	Does not touch the index file or the working tree at all (but
      -	resets the head to `<commit>`, just like all modes do). This leaves
     --	all your changed files "Changes to be committed", as `git status`
      +	resets the head to _<commit>_, just like all modes do). This leaves
     -+	all your changed files "Changes to be committed", as `git status
     + 	all your changed files "Changes to be committed", as `git status`
       	would put it.
       
      ---mixed::
 2:  6206e65ac4d = 2:  440eac1f974 doc: fix synopsis analysis logic
 3:  41a01969d93 = 3:  6814e98f71d doc: convert git-rm to new documentation format
 4:  9f7cd02cc1e = 4:  2a129734e3d doc: move synopsis git-mv commands in the synopsis section
 5:  4887567c57c ! 5:  1868dfc3282 doc: convert git-mv to new documentation format
     @@ Documentation/git-mv.adoc: git-mv - Move or rename a file, a directory, or a sym
      +
      +[synopsis]
      +git mv [-v] [-f] [-n] [-k] <source> <destination>
     -+git mv [-v] [-f] [-n] [-k] <source> ... <destination-directory>
     ++git mv [-v] [-f] [-n] [-k] <source>... <destination-directory>
       
       DESCRIPTION
       -----------
     @@ Documentation/git-mv.adoc: SUBMODULES
       
       BUGS
       ----
     +
     + ## builtin/mv.c ##
     +@@
     + 
     + static const char * const builtin_mv_usage[] = {
     + 	N_("git mv [-v] [-f] [-n] [-k] <source> <destination>"),
     +-	N_("git mv [-v] [-f] [-n] [-k] <source> ... <destination-directory>"),
     ++	N_("git mv [-v] [-f] [-n] [-k] <source>... <destination-directory>"),
     + 	NULL
     + };
     + 
 -:  ----------- > 6:  2ddce76f14d doc: fix asciidoctor synopsis processing of triple-dots
 -:  ----------- > 7:  2690f84602b doc: add markup for characters in Guidelines

-- 
gitgitgadget

  parent reply	other threads:[~2025-04-12 12:20 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-03-30 17:15 [PATCH 0/5] doc: convert git-reset, git-rm and git-mv to new documentation format Jean-Noël Avila via GitGitGadget
2025-03-30 17:16 ` [PATCH 1/5] doc: convert git-reset " Jean-Noël Avila via GitGitGadget
2025-04-04 16:39   ` Martin Ågren
2025-03-30 17:16 ` [PATCH 2/5] doc: fix synopsis analysis logic Jean-Noël Avila via GitGitGadget
2025-04-04 16:39   ` Martin Ågren
2025-04-12  8:58     ` Jean-Noël Avila
2025-03-30 17:16 ` [PATCH 3/5] doc: convert git-rm to new documentation format Jean-Noël Avila via GitGitGadget
2025-03-30 17:16 ` [PATCH 4/5] doc: move synopsis git-mv commands in the synopsis section Jean-Noël Avila via GitGitGadget
2025-04-05 10:57   ` Martin Ågren
2025-03-30 17:16 ` [PATCH 5/5] doc: convert git-mv to new documentation format Jean-Noël Avila via GitGitGadget
2025-04-12 12:20 ` Jean-Noël Avila via GitGitGadget [this message]
2025-04-12 12:20   ` [PATCH v2 1/7] doc: convert git-reset " Jean-Noël Avila via GitGitGadget
2025-04-12 12:20   ` [PATCH v2 2/7] doc: fix synopsis analysis logic Jean-Noël Avila via GitGitGadget
2025-04-12 12:20   ` [PATCH v2 3/7] doc: convert git-rm to new documentation format Jean-Noël Avila via GitGitGadget
2025-04-12 12:20   ` [PATCH v2 4/7] doc: move synopsis git-mv commands in the synopsis section Jean-Noël Avila via GitGitGadget
2025-04-12 12:20   ` [PATCH v2 5/7] doc: convert git-mv to new documentation format Jean-Noël Avila via GitGitGadget
2025-04-12 12:20   ` [PATCH v2 6/7] doc: fix asciidoctor synopsis processing of triple-dots Jean-Noël Avila via GitGitGadget
2025-04-12 12:20   ` [PATCH v2 7/7] doc: add markup for characters in Guidelines Jean-Noël Avila via GitGitGadget
2025-04-14 21:47   ` [PATCH v2 0/7] doc: convert git-reset, git-rm and git-mv to new documentation format Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=pull.1896.v2.git.1744460450.gitgitgadget@gmail.com \
    --to=gitgitgadget@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=jn.avila@free.fr \
    --cc=martin.agren@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).