From patchwork Mon Oct 22 20:45:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Heiduk X-Patchwork-Id: 10652497 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5717B14DE for ; Mon, 22 Oct 2018 20:46:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9675128C29 for ; Mon, 22 Oct 2018 20:46:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8ADDB29022; Mon, 22 Oct 2018 20:46:25 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3992528C29 for ; Mon, 22 Oct 2018 20:46:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729176AbeJWFG1 (ORCPT ); Tue, 23 Oct 2018 01:06:27 -0400 Received: from mail-wr1-f66.google.com ([209.85.221.66]:36702 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728523AbeJWFG1 (ORCPT ); Tue, 23 Oct 2018 01:06:27 -0400 Received: by mail-wr1-f66.google.com with SMTP id y16so46434890wrw.3 for ; Mon, 22 Oct 2018 13:46:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=W1hxw2dE1Psk7NtochpJlWsHaCZ/1tphENb1kx7LCZw=; b=CzxhSEL6jJAdZUKEpBnmSU7nunJHzFHTE5ftA3VJUn8u9wC7/cZdUC2++6V8wfJU0A 2LDtAJntRIlw5O55/eST11z0MmBn75jZfENdZHdU8xEDwxSJwjKIw1t6C/aLu8rKSTPp Gg+lQ8pwqyAAULIAi5ELf+tqFAnlhV+qtvW7D6aGx/0SRv/anc2Bm4csUCBaO7XeMvzJ tkXgoTRz/iip29nOibt5my/rcl2IcWvBdy5pjKcamsT8ixQw6Ys5XhapqMKLzUY8eTIr BVHhscwO7MTsBMkjMzriUX4jSinTcaZBFqTg04qkFYYDkwHKMY5SmQwRAhL5SngJY7Nk UKvQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=W1hxw2dE1Psk7NtochpJlWsHaCZ/1tphENb1kx7LCZw=; b=unXqOzVOGkV1MRA/QmWF+DsWQjZwFAOZlv+US5YqrDbbeK+vELNEGllyfD2eCrsGwR PfFgKZ/GT1ihcMbf1YvbZE1AUfAmH86MTE+wvugG5+j1eFqS6eg8aP0YhkLH3/Tid453 kn5LxxlKt3oJnLpDYejMrOl9fogqLARwv0FtI+bmTJdQjQ4QqQSTMfnY0szJfrYalzot csyLxGk3xOHbkTfbUfIp23tg1rJT/bNCuY6YpJUAOFDEgj4hFgAN61UNAbMU/LTFW/Rt QuNmbuwFLUzOqAmu3hCE6JXhhLwYv1zPqV0MYn5/CBaGvzaqmJeCXGoZ0zjVxot0FHxK f+EA== X-Gm-Message-State: AGRZ1gJIg/XtV0m3Y5YVgheT9V5xYhMIE9T2LK0gBoRpbo2yzv6kln0+ mWPBatlG1xlcv4nZ5WkgpkJwc8+Y X-Google-Smtp-Source: AJdET5fNATdO3x9I5XVO4/kj6hWSNRsFic+kvEqEvxNNARSUvP30vfZjwOZ1NIfDcIIthOpsYk2Y1g== X-Received: by 2002:a5d:45c6:: with SMTP id b6-v6mr8278006wrs.296.1540241180611; Mon, 22 Oct 2018 13:46:20 -0700 (PDT) Received: from arrakeen.fritz.box ([2001:a62:81d:ab01:4936:e72c:acbd:e1bd]) by smtp.gmail.com with ESMTPSA id r134-v6sm9526526wmg.9.2018.10.22.13.46.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 22 Oct 2018 13:46:20 -0700 (PDT) From: Andreas Heiduk To: Git Mailing List Cc: Andreas Heiduk Subject: [PATCH 1/6] doc: clarify boundaries of 'git worktree list --porcelain' Date: Mon, 22 Oct 2018 22:45:41 +0200 Message-Id: <20181022204546.20354-2-asheiduk@gmail.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181022204546.20354-1-asheiduk@gmail.com> References: <20181022204546.20354-1-asheiduk@gmail.com> MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Defined delimiters for 'git worktree list --porcelain' make the format easier to parse in scripts. For example sed -n '/^worktree ID$/,/^$/p' extracts only the information for the worktree 'ID'. The format did not changed since [1], only the guaranty is added. [1] bb9c03b82a (worktree: add 'list' command, 2015-10-08) Signed-off-by: Andreas Heiduk --- Documentation/git-worktree.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/git-worktree.txt b/Documentation/git-worktree.txt index e2ee9fc21b..73520434f6 100644 --- a/Documentation/git-worktree.txt +++ b/Documentation/git-worktree.txt @@ -270,8 +270,8 @@ Porcelain Format The porcelain format has a line per attribute. Attributes are listed with a label and value separated by a single space. Boolean attributes (like 'bare' and 'detached') are listed as a label only, and are only present if and only -if the value is true. An empty line indicates the end of a worktree. For -example: +if the value is true. The first attribute of a worktree is always `worktree`, +an empty line indicates the end of the record. For example: ------------ $ git worktree list --porcelain From patchwork Mon Oct 22 20:45:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Heiduk X-Patchwork-Id: 10652499 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D00C714DE for ; Mon, 22 Oct 2018 20:46:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1864A28C29 for ; Mon, 22 Oct 2018 20:46:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0957029022; Mon, 22 Oct 2018 20:46:27 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8282228C29 for ; Mon, 22 Oct 2018 20:46:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729181AbeJWFG3 (ORCPT ); Tue, 23 Oct 2018 01:06:29 -0400 Received: from mail-wr1-f66.google.com ([209.85.221.66]:46209 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729105AbeJWFG2 (ORCPT ); Tue, 23 Oct 2018 01:06:28 -0400 Received: by mail-wr1-f66.google.com with SMTP id i4-v6so7677460wrr.13 for ; Mon, 22 Oct 2018 13:46:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=wbG2FDixWtqd8XyA64OUh4GeD78GzZqn9m8g75NVBDU=; b=C7goYrVKKUeUDR9a3GfX1HCga9LEmAh0QNRKnNnnBuxqkhgMZnTC83S0BS2+b4Z4yv yvmAsTjE9s8EHvIrBhjQTNL/u3/7AjXD7BTzN/SsZswCfZ+Fcy2ckiOHYa6xEYg4HthR 4Q7/pMpHU94O1QR/yeFeGqaMk0HyGhEFVA//wkjznos32HSeclQZwT1GlAP9bT6LjA8J 5QffFNzAuaBqsai4XAAW5NSx+NLghSndCpf8PPd9raPHRbRPburLUN7h967rlpu6y3Dk +BypUU4qLq6gKnl5afTsxfHA3QE2zM7S7C1ZS6DAdCP6SUz3gZceIGaIz2ox48RcgX0P Zu2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=wbG2FDixWtqd8XyA64OUh4GeD78GzZqn9m8g75NVBDU=; b=KViKdO9ysm9htvuRuPgYQv3nxvTsYODeQWLUzwSIFmCCq9QtA9aDZF42+YrrY055JW RoNUlOQqkYGY8qX6oEVO0TUh8dmgx7ONXAnaxjROGRK08x5w79/tl3P7JDWEhe/yNBWm bR4GXC95/b+M+ME6VhOqvx8l036ZsYtBiY4OGsM6IpljJAbHl3XzJZ7UMBgBRvDHSx66 ztjtU0FsuSiy078W0JCx1BK/aZ0en45k1pbXi8fEIudQ8EtbJ0Atirsvmzi+6pRi6G9d OR1pIr85MuMhEC2E9qQGyPWBd0K16E4Qt42AR9lJckvKEFzHFdSmRhUi7Et2IkiJDk6L pRRg== X-Gm-Message-State: ABuFfohnYvkNhAJdKflmckLkXbT+gTTgHfeCH1E+C5d8WJXZ15g5BSRa CPdwHROauNz/fs6ULqsU67oQJRcf X-Google-Smtp-Source: ACcGV63ks8B5ccmkP4tOHojbV9zjuWo4T8IyPZmmjcqJTrbmFZlU5t3Kk/FzZ25Y3XBtI+8tHmFELA== X-Received: by 2002:a05:6000:1105:: with SMTP id z5mr45812566wrw.136.1540241181573; Mon, 22 Oct 2018 13:46:21 -0700 (PDT) Received: from arrakeen.fritz.box ([2001:a62:81d:ab01:4936:e72c:acbd:e1bd]) by smtp.gmail.com with ESMTPSA id r134-v6sm9526526wmg.9.2018.10.22.13.46.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 22 Oct 2018 13:46:20 -0700 (PDT) From: Andreas Heiduk To: Git Mailing List Cc: Andreas Heiduk Subject: [PATCH 2/6] doc: fix ASCII art tab spacing Date: Mon, 22 Oct 2018 22:45:42 +0200 Message-Id: <20181022204546.20354-3-asheiduk@gmail.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181022204546.20354-1-asheiduk@gmail.com> References: <20181022204546.20354-1-asheiduk@gmail.com> MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Followup to 5dd05ebf ("doc: fix merge-base ASCII art tab spacing", 2016-10-21) Signed-off-by: Andreas Heiduk --- Documentation/git-bisect-lk2009.txt | 30 ++++++++++++++--------------- Documentation/git-checkout.txt | 14 +++++++------- Documentation/git-merge-base.txt | 6 +++--- 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/Documentation/git-bisect-lk2009.txt b/Documentation/git-bisect-lk2009.txt index 0f9ef2f25e..e99925184d 100644 --- a/Documentation/git-bisect-lk2009.txt +++ b/Documentation/git-bisect-lk2009.txt @@ -633,11 +633,11 @@ and so at step 3) we compute f(X). Let's take the following graph as an example: ------------- - G-H-I-J - / \ + G-H-I-J + / \ A-B-C-D-E-F O - \ / - K-L-M-N + \ / + K-L-M-N ------------- If we compute the following non optimal function on it: @@ -649,25 +649,25 @@ g(X) = min(number_of_ancestors(X), number_of_descendants(X)) we get: ------------- - 4 3 2 1 - G-H-I-J + 4 3 2 1 + G-H-I-J 1 2 3 4 5 6/ \0 A-B-C-D-E-F O - \ / - K-L-M-N - 4 3 2 1 + \ / + K-L-M-N + 4 3 2 1 ------------- but with the algorithm used by git bisect we get: ------------- - 7 7 6 5 - G-H-I-J + 7 7 6 5 + G-H-I-J 1 2 3 4 5 6/ \0 A-B-C-D-E-F O - \ / - K-L-M-N - 7 7 6 5 + \ / + K-L-M-N + 7 7 6 5 ------------- So we chose G, H, K or L as the best bisection point, which is better @@ -773,7 +773,7 @@ forked of the main branch at a commit named "D" like this: ------------- A-B-C-D-E-F-G <--main \ - H-I-J <--dev + H-I-J <--dev ------------- The commit "D" is called a "merge base" for branch "main" and "dev" diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt index 9db02928c4..801de2f764 100644 --- a/Documentation/git-checkout.txt +++ b/Documentation/git-checkout.txt @@ -311,9 +311,9 @@ branch refers to a specific commit. Let's look at a repo with three commits, one of them tagged, and with branch 'master' checked out: ------------ - HEAD (refers to branch 'master') - | - v + HEAD (refers to branch 'master') + | + v a---b---c branch 'master' (refers to commit 'c') ^ | @@ -329,9 +329,9 @@ to commit 'd': ------------ $ edit; git add; git commit - HEAD (refers to branch 'master') - | - v + HEAD (refers to branch 'master') + | + v a---b---c---d branch 'master' (refers to commit 'd') ^ | @@ -398,7 +398,7 @@ at what happens when we then checkout master: ------------ $ git checkout master - HEAD (refers to branch 'master') + HEAD (refers to branch 'master') e---f | / v a---b---c---d branch 'master' (refers to commit 'd') diff --git a/Documentation/git-merge-base.txt b/Documentation/git-merge-base.txt index 502e00ec35..9f07f4f6ed 100644 --- a/Documentation/git-merge-base.txt +++ b/Documentation/git-merge-base.txt @@ -154,13 +154,13 @@ topic origin/master`, the history of remote-tracking branch `origin/master` may have been rewound and rebuilt, leading to a history of this shape: - o---B2 + o---B2 / ---o---o---B1--o---o---o---B (origin/master) \ - B0 + B0 \ - D0---D1---D (topic) + D0---D1---D (topic) where `origin/master` used to point at commits B0, B1, B2 and now it points at B, and your `topic` branch was started on top of it back From patchwork Mon Oct 22 20:45:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Heiduk X-Patchwork-Id: 10652501 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7EF6513A4 for ; Mon, 22 Oct 2018 20:46:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BDD2429058 for ; Mon, 22 Oct 2018 20:46:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AF22B29022; Mon, 22 Oct 2018 20:46:28 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 15BFA29022 for ; Mon, 22 Oct 2018 20:46:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729187AbeJWFGb (ORCPT ); Tue, 23 Oct 2018 01:06:31 -0400 Received: from mail-wm1-f66.google.com ([209.85.128.66]:51568 "EHLO mail-wm1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728523AbeJWFG3 (ORCPT ); Tue, 23 Oct 2018 01:06:29 -0400 Received: by mail-wm1-f66.google.com with SMTP id 143-v6so11601649wmf.1 for ; Mon, 22 Oct 2018 13:46:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=6LhMNufZzSgQItXyW/Og2mFsutqsu+K5cKxiaHLyTyM=; b=Cw1rIOC7EINjA7QdsNE87Kj4xMw8G+vWbkpEo3Pe7SYFemuHmxiLHHKm5xLCR2OXjE aETxGCaZ51JSYh47V96qJ3VHOUj69P/XhLDEecDF/mHQcTUZ5yPnH0g6vhdOOjwyzOQH UQA7O25WZMCqUs55VYpiEWGXQruATMH0l/KxgFLnI+F4J0esBZrsFbejGI4kXCbj6f/P O3wqIYI1fRd8pdLoksvnkkhqo+Nr/xmw+NqaU6XhzA+zP8sU3DSzS4hSaP42Z1zDEC9f h6aurJXyq6qw6IFydzQpndRXOHf6WcsXkE3FMJl/w+Jw8DZ9+01FbLlucd6I8Mp5nGNM 9+TA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=6LhMNufZzSgQItXyW/Og2mFsutqsu+K5cKxiaHLyTyM=; b=Npt7zjncJf6bGuG8Uqs6C22KriH3xR2i3G/nM6aQqVAhc6n3k5JTYfllMhHeUa7l9F OwLIYs3c/Fo86DP+mO5T0eiIvK+bQKFABauOXTIT80NKth7jWVQTDWe/6o4a2DFdB3Iq 2xymWwaVoYRJHCAUlF4VWcO0DF7IIfyaPqfptJXIKBxu4wOzg1FZP0P4eMlYHm0y8Uhy 30n/bZNzfU2NzjKtnHp5atQZ/xPnJciIeknpbtbL3jxwDtL+f7e1IMKWh52gvCg9X39y 2W+tQqjDYmqdqb/EfFbYzwJKCu3Gqv4PBF9MQYqlIqCLuesepjoS8w7SxFEnK8NCbxvN 5bFw== X-Gm-Message-State: ABuFfog+NDkwKgFD8Sr4ceB4Zxf6mzigmZ+nYelXP24IC1ok//0hx5Fp nSmkttNYbFCjCHKHByuyHf5xaymy X-Google-Smtp-Source: ACcGV61CtKxNSUVFWvGMv+Hz1R3gugQkZxInBFky43Tlz7hkdm22eLOAkC8g9qnPE3Cq9exEW43HAA== X-Received: by 2002:a1c:8601:: with SMTP id i1-v6mr17002960wmd.148.1540241182767; Mon, 22 Oct 2018 13:46:22 -0700 (PDT) Received: from arrakeen.fritz.box ([2001:a62:81d:ab01:4936:e72c:acbd:e1bd]) by smtp.gmail.com with ESMTPSA id r134-v6sm9526526wmg.9.2018.10.22.13.46.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 22 Oct 2018 13:46:21 -0700 (PDT) From: Andreas Heiduk To: Git Mailing List Cc: Andreas Heiduk Subject: [PATCH 3/6] doc: fix inappropriate monospace formatting Date: Mon, 22 Oct 2018 22:45:43 +0200 Message-Id: <20181022204546.20354-4-asheiduk@gmail.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181022204546.20354-1-asheiduk@gmail.com> References: <20181022204546.20354-1-asheiduk@gmail.com> MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Andreas Heiduk --- Documentation/git-upload-pack.txt | 1 + Documentation/git.txt | 10 +++++----- Documentation/gitattributes.txt | 30 +++++++++++++++--------------- Documentation/gitmodules.txt | 17 ++++++++++------- Documentation/gitsubmodules.txt | 14 +++++++++----- 5 files changed, 40 insertions(+), 32 deletions(-) diff --git a/Documentation/git-upload-pack.txt b/Documentation/git-upload-pack.txt index 822ad593af..998f52d3df 100644 --- a/Documentation/git-upload-pack.txt +++ b/Documentation/git-upload-pack.txt @@ -11,6 +11,7 @@ SYNOPSIS [verse] 'git-upload-pack' [--[no-]strict] [--timeout=] [--stateless-rpc] [--advertise-refs] + DESCRIPTION ----------- Invoked by 'git fetch-pack', learns what diff --git a/Documentation/git.txt b/Documentation/git.txt index 2ac9b1c7fe..00156d64aa 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -402,11 +402,11 @@ Git so take care if using a foreign front-end. of Git object directories which can be used to search for Git objects. New objects will not be written to these directories. + - Entries that begin with `"` (double-quote) will be interpreted - as C-style quoted paths, removing leading and trailing - double-quotes and respecting backslash escapes. E.g., the value - `"path-with-\"-and-:-in-it":vanilla-path` has two paths: - `path-with-"-and-:-in-it` and `vanilla-path`. +Entries that begin with `"` (double-quote) will be interpreted +as C-style quoted paths, removing leading and trailing +double-quotes and respecting backslash escapes. E.g., the value +`"path-with-\"-and-:-in-it":vanilla-path` has two paths: +`path-with-"-and-:-in-it` and `vanilla-path`. `GIT_DIR`:: If the `GIT_DIR` environment variable is set then it diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt index 92010b062e..b8392fc330 100644 --- a/Documentation/gitattributes.txt +++ b/Documentation/gitattributes.txt @@ -303,21 +303,21 @@ number of pitfalls: attribute. If you decide to use the `working-tree-encoding` attribute in your repository, then it is strongly recommended to ensure that all clients working with the repository support it. - - For example, Microsoft Visual Studio resources files (`*.rc`) or - PowerShell script files (`*.ps1`) are sometimes encoded in UTF-16. - If you declare `*.ps1` as files as UTF-16 and you add `foo.ps1` with - a `working-tree-encoding` enabled Git client, then `foo.ps1` will be - stored as UTF-8 internally. A client without `working-tree-encoding` - support will checkout `foo.ps1` as UTF-8 encoded file. This will - typically cause trouble for the users of this file. - - If a Git client, that does not support the `working-tree-encoding` - attribute, adds a new file `bar.ps1`, then `bar.ps1` will be - stored "as-is" internally (in this example probably as UTF-16). - A client with `working-tree-encoding` support will interpret the - internal contents as UTF-8 and try to convert it to UTF-16 on checkout. - That operation will fail and cause an error. ++ +For example, Microsoft Visual Studio resources files (`*.rc`) or +PowerShell script files (`*.ps1`) are sometimes encoded in UTF-16. +If you declare `*.ps1` as files as UTF-16 and you add `foo.ps1` with +a `working-tree-encoding` enabled Git client, then `foo.ps1` will be +stored as UTF-8 internally. A client without `working-tree-encoding` +support will checkout `foo.ps1` as UTF-8 encoded file. This will +typically cause trouble for the users of this file. ++ +If a Git client, that does not support the `working-tree-encoding` +attribute, adds a new file `bar.ps1`, then `bar.ps1` will be +stored "as-is" internally (in this example probably as UTF-16). +A client with `working-tree-encoding` support will interpret the +internal contents as UTF-8 and try to convert it to UTF-16 on checkout. +That operation will fail and cause an error. - Reencoding content to non-UTF encodings can cause errors as the conversion might not be UTF-8 round trip safe. If you suspect your diff --git a/Documentation/gitmodules.txt b/Documentation/gitmodules.txt index 4d63def206..312b6f9259 100644 --- a/Documentation/gitmodules.txt +++ b/Documentation/gitmodules.txt @@ -67,7 +67,8 @@ submodule..fetchRecurseSubmodules:: submodule..ignore:: Defines under what circumstances "git status" and the diff family show a submodule as modified. The following values are supported: - ++ +-- all;; The submodule will never be considered modified (but will nonetheless show up in the output of status and commit when it has been staged). @@ -84,12 +85,14 @@ submodule..ignore:: differences, and modifications to tracked and untracked files are shown. This is the default option. - If this option is also present in the submodules entry in .git/config - of the superproject, the setting there will override the one found in - .gitmodules. - Both settings can be overridden on the command line by using the - "--ignore-submodule" option. The 'git submodule' commands are not - affected by this setting. +If this option is also present in the submodules entry in .git/config +of the superproject, the setting there will override the one found in +.gitmodules. + +Both settings can be overridden on the command line by using the +"--ignore-submodule" option. The 'git submodule' commands are not +affected by this setting. +-- submodule..shallow:: When set to true, a clone of this submodule will be performed as a diff --git a/Documentation/gitsubmodules.txt b/Documentation/gitsubmodules.txt index 504c5f1a88..57999e9f36 100644 --- a/Documentation/gitsubmodules.txt +++ b/Documentation/gitsubmodules.txt @@ -169,11 +169,15 @@ ACTIVE SUBMODULES A submodule is considered active, - (a) if `submodule..active` is set to `true` - or - (b) if the submodule's path matches the pathspec in `submodule.active` - or - (c) if `submodule..url` is set. + a. if `submodule..active` is set to `true` ++ +or + + b. if the submodule's path matches the pathspec in `submodule.active` ++ +or + + c. if `submodule..url` is set. and these are evaluated in this order. From patchwork Mon Oct 22 20:45:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Heiduk X-Patchwork-Id: 10652507 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D2F1E14DE for ; Mon, 22 Oct 2018 20:46:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1E82528C29 for ; Mon, 22 Oct 2018 20:46:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1265A29022; Mon, 22 Oct 2018 20:46:32 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id ADE9028C29 for ; Mon, 22 Oct 2018 20:46:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729185AbeJWFGb (ORCPT ); Tue, 23 Oct 2018 01:06:31 -0400 Received: from mail-wm1-f67.google.com ([209.85.128.67]:34991 "EHLO mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729177AbeJWFGa (ORCPT ); Tue, 23 Oct 2018 01:06:30 -0400 Received: by mail-wm1-f67.google.com with SMTP id w186-v6so456145wmf.0 for ; Mon, 22 Oct 2018 13:46:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ZL8OGRnPcCzp5CYP0PRHw5mlUL9DMIzcaR4lBnDuVRQ=; b=Stx3DpSQWZsRrzKGuNV3t2QsVighsYGkXx7vsyRGe2aqo0OPJexdopmlh8Cq641jft HpazqkPEaa22MT4OPXUMvCHLpxW0ErCo6ff2sLKwVvBW5nTbVATpgfH6sQ7U2KKZ620P vb/pZGqwaBvvVFBF5clLBfb4ech+OZQ6TeH8rjvNednVkGa2V9rDSFxAq3AlRyDrFMcP 7+YnFvdAj13fmSF7DaWcbh3o4od5A0vAPJolXJkNyayMmKFXgYhGCKYIQVjUApS9QU4f 3AXlfU944ZNvfCcizc6l6DXmHABoJRcnOVhoE/y3mJPuBBNNXI08moUsX2XC1EwtskFd CcEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ZL8OGRnPcCzp5CYP0PRHw5mlUL9DMIzcaR4lBnDuVRQ=; b=orIrk/qsIcBtmtwF+wgFK96lAMQOZZEyO6Azwa2MTtiqkLJMQrHjSyS9lSGxKAB9E7 G2dhUCreBr8r1uUQ4moY3RqRiF4lbQNnrOImXMUb3e+gEnwg7KeQvE4qrqZCWYkH9TAh /Qq+ottqDWHmTKiY88OdMwX7LUnIx2eJm4BXconWA1mNaLYKWwTdriPurcb2l8aoY5n0 4VGn8yVJEmuWLQ4uPdP1OToPZPtJPXZxl2qTPUMQWLTp+qvwGzAJ4VZX/zTUXLW/a1+X p8dNKrkedA8iASsCpYEjhcRtPgtdeC6yTRTk1mBPxCuyVldKvOruhuW61TIde4FMPVbe ZSAw== X-Gm-Message-State: ABuFfohHZwHj/uInA3PhFYg/+88sqk0MLIgwePoRF1+AsarcoQWPYenC wxOz52Fe5JAfF73VlIsl65YCD+Sa X-Google-Smtp-Source: ACcGV63oiBXa7xSv0onG4CcEfHZgVeaZs5AU/xw0dZXPrxM5pGvldqPCMqrrPJDIdsYvtEUx0Vn9Gw== X-Received: by 2002:a1c:950f:: with SMTP id x15-v6mr16938412wmd.3.1540241183960; Mon, 22 Oct 2018 13:46:23 -0700 (PDT) Received: from arrakeen.fritz.box ([2001:a62:81d:ab01:4936:e72c:acbd:e1bd]) by smtp.gmail.com with ESMTPSA id r134-v6sm9526526wmg.9.2018.10.22.13.46.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 22 Oct 2018 13:46:23 -0700 (PDT) From: Andreas Heiduk To: Git Mailing List Cc: Andreas Heiduk Subject: [PATCH 4/6] doc: fix descripion for 'git tag --format' Date: Mon, 22 Oct 2018 22:45:44 +0200 Message-Id: <20181022204546.20354-5-asheiduk@gmail.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181022204546.20354-1-asheiduk@gmail.com> References: <20181022204546.20354-1-asheiduk@gmail.com> MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The '--format=' is now listed in the 'OPTIONS' section, not only the '' string itself. The description moved up a few paragraphs because '' is not a standalone paramater but a parameter for the option '--format'. Signed-off-by: Andreas Heiduk --- Documentation/git-tag.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Documentation/git-tag.txt b/Documentation/git-tag.txt index 92f9c12b87..f2d644e3af 100644 --- a/Documentation/git-tag.txt +++ b/Documentation/git-tag.txt @@ -187,6 +187,12 @@ This option is only applicable when listing tags without annotation lines. `--create-reflog`, but currently does not negate the setting of `core.logAllRefUpdates`. +--format=:: + A string that interpolates `%(fieldname)` from a tag ref being shown + and the object it points at. The format is the same as + that of linkgit:git-for-each-ref[1]. When unspecified, + defaults to `%(refname:strip=2)`. + :: The name of the tag to create, delete, or describe. The new tag name must pass all checks defined by @@ -198,12 +204,6 @@ This option is only applicable when listing tags without annotation lines. The object that the new tag will refer to, usually a commit. Defaults to HEAD. -:: - A string that interpolates `%(fieldname)` from a tag ref being shown - and the object it points at. The format is the same as - that of linkgit:git-for-each-ref[1]. When unspecified, - defaults to `%(refname:strip=2)`. - CONFIGURATION ------------- By default, 'git tag' in sign-with-default mode (-s) will use your From patchwork Mon Oct 22 20:45:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Heiduk X-Patchwork-Id: 10652503 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C5CA45BB5 for ; Mon, 22 Oct 2018 20:46:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1023229022 for ; Mon, 22 Oct 2018 20:46:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 040B029058; Mon, 22 Oct 2018 20:46:29 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8C3EB29038 for ; Mon, 22 Oct 2018 20:46:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729188AbeJWFGc (ORCPT ); Tue, 23 Oct 2018 01:06:32 -0400 Received: from mail-wm1-f66.google.com ([209.85.128.66]:53883 "EHLO mail-wm1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728266AbeJWFGb (ORCPT ); Tue, 23 Oct 2018 01:06:31 -0400 Received: by mail-wm1-f66.google.com with SMTP id y11-v6so11685502wma.3 for ; Mon, 22 Oct 2018 13:46:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Xb1l50mqw7I3J68/EmgVaqjceKjiiJ3BYlNQY6GvrPw=; b=vhm0NiGoIzevpRIsozzoCgyaXVj/DiBxx7AqrWQCrjeJQYdYvMKC7QrSKyE/VC/S0F kQS+FuFwje/e2DuiO0n/6WyKCtF/IjVsdlqFdKDhGGmTRkLrVhX0BuQc9PITcrEqS2MN 67INUmobtv7hUxam4RAwQjdhXY3zoeSy+AT0q1wIDeo1SxjFICDk3r0G2Z5qTlZ3JKSP L1wmvv6ms4CDlC8VzrJrhYIAsLccUIV37X6ySf80r/YWQERjHGcOU0b5/D4ReYPt8lgY yfb1+0vsApxm8m7eVJq9+FFbhrZYTmWM587RivunTbo9d4epBDdFuBbmnX6byc5dwo3A bhnA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Xb1l50mqw7I3J68/EmgVaqjceKjiiJ3BYlNQY6GvrPw=; b=js8UDmyNeZulkquHWPt/AuKm+rh/4Tztky+UB37TXeD7WR/ndX1m5RHt01zWWck1sM TQNxAvWzogmLIIXlijpjbB/WH9NXcd7Jzu7WU6aHj7BAdMWiroxixWpK4zO/1UdWq0pV hjwgwM4TI3KstsZCp90MBRUvge0oYxBRP78Uzpe5QcUkh790xUwLllbleVbnBMQoIFNT eMKCC5H3WClkeMOEeQv1Ed4scXOunSCuMS5J2ubfZ6zklb5BGchxoFNgMglwRBEOG9f4 7oPpTwhJTRHAfQg+L4tJlaWZzU7AnFoZV94DbSKBjvir9fnHdZ42vdSzv084dqMWbFwn JIBA== X-Gm-Message-State: ABuFfoguilc+IA9cbMyqCDMdLRyXu18f4Y6QTQZDgTfQmZGKvo6OGPRz ZPkdvlorN7FB6urob9Zt5g9DPuAp X-Google-Smtp-Source: ACcGV625LWOwNOMxy/VRL4gHIjFr3krWH6OrvEwsIMdkvpVmO6INnnTBnYDZAtzg5SKPg9V9igMt/w== X-Received: by 2002:a1c:1507:: with SMTP id 7-v6mr16683650wmv.6.1540241184983; Mon, 22 Oct 2018 13:46:24 -0700 (PDT) Received: from arrakeen.fritz.box ([2001:a62:81d:ab01:4936:e72c:acbd:e1bd]) by smtp.gmail.com with ESMTPSA id r134-v6sm9526526wmg.9.2018.10.22.13.46.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 22 Oct 2018 13:46:24 -0700 (PDT) From: Andreas Heiduk To: Git Mailing List Cc: Andreas Heiduk Subject: [PATCH 5/6] doc: fix indentation of listing blocks in gitweb.conf.txt Date: Mon, 22 Oct 2018 22:45:45 +0200 Message-Id: <20181022204546.20354-6-asheiduk@gmail.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181022204546.20354-1-asheiduk@gmail.com> References: <20181022204546.20354-1-asheiduk@gmail.com> MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 'gitweb.conf.txt' uses inconsistent indentation in listing blocks and a mix of listing blocks and literal paragraphs. Both didn't look pretty in the rendered HTML page. Signed-off-by: Andreas Heiduk --- Documentation/gitweb.conf.txt | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/Documentation/gitweb.conf.txt b/Documentation/gitweb.conf.txt index 9c8982ec98..c0a326e388 100644 --- a/Documentation/gitweb.conf.txt +++ b/Documentation/gitweb.conf.txt @@ -19,10 +19,12 @@ end of a line is ignored. See *perlsyn*(1) for details. An example: - # gitweb configuration file for http://git.example.org - # - our $projectroot = "/srv/git"; # FHS recommendation - our $site_name = 'Example.org >> Repos'; +------------------------------------------------ +# gitweb configuration file for http://git.example.org +# +our $projectroot = "/srv/git"; # FHS recommendation +our $site_name = 'Example.org >> Repos'; +------------------------------------------------ The configuration file is used to override the default settings that @@ -357,6 +359,7 @@ $home_link_str:: + For example, the following setting produces a breadcrumb trail like "home / dev / projects / ..." where "projects" is the home link. ++ ---------------------------------------------------------------------------- our @extra_breadcrumbs = ( [ 'home' => 'https://www.example.org/' ], @@ -901,14 +904,16 @@ To enable blame, pickaxe search, and snapshot support (allowing "tar.gz" and "zip" snapshots), while allowing individual projects to turn them off, put the following in your GITWEB_CONFIG file: - $feature{'blame'}{'default'} = [1]; - $feature{'blame'}{'override'} = 1; +-------------------------------------------------------------------------------- +$feature{'blame'}{'default'} = [1]; +$feature{'blame'}{'override'} = 1; - $feature{'pickaxe'}{'default'} = [1]; - $feature{'pickaxe'}{'override'} = 1; +$feature{'pickaxe'}{'default'} = [1]; +$feature{'pickaxe'}{'override'} = 1; - $feature{'snapshot'}{'default'} = ['zip', 'tgz']; - $feature{'snapshot'}{'override'} = 1; +$feature{'snapshot'}{'default'} = ['zip', 'tgz']; +$feature{'snapshot'}{'override'} = 1; +-------------------------------------------------------------------------------- If you allow overriding for the snapshot feature, you can specify which snapshot formats are globally disabled. You can also add any command-line From patchwork Mon Oct 22 20:45:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Heiduk X-Patchwork-Id: 10652505 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4684414DE for ; Mon, 22 Oct 2018 20:46:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8648228C29 for ; Mon, 22 Oct 2018 20:46:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7961129022; Mon, 22 Oct 2018 20:46:30 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1D30828C29 for ; Mon, 22 Oct 2018 20:46:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729192AbeJWFGd (ORCPT ); Tue, 23 Oct 2018 01:06:33 -0400 Received: from mail-wm1-f66.google.com ([209.85.128.66]:34993 "EHLO mail-wm1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729177AbeJWFGc (ORCPT ); Tue, 23 Oct 2018 01:06:32 -0400 Received: by mail-wm1-f66.google.com with SMTP id w186-v6so456227wmf.0 for ; Mon, 22 Oct 2018 13:46:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=EnRv7OGUnsjCR+ZGKa5anJYm2OLvka8QLZl86oX7U9g=; b=hdA0cUaf2mnUTziXtx0xH6JmSS7puumousN9/FLGlLtlVNWLSv/aK1BJ4XDAomiQkd Ekd/Po/YS0l3izXL4W9g1DbxxnuVtdu5RuAdhmxh7QjKT76PAs2rrnr7RSzSMicKhwHQ AEodl6zgIIyIflZBIGJMhhHVnaaaLvnhe2SW9NXhymnmNvLUAX/2fbsKfHHR2zgxXLqw 66tA5tHlWy2ugusezpUvzNnS3vN2hnbU3hd5/2XADJojuMt7N9coK4mnayQn8fLD21Z9 l0KRmA3A1hCJtsY/6ZcF8jRoAdnyw6COlgvRD1ATw/1wBzf2zwwaL8v9h4z810ftTps6 JchA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=EnRv7OGUnsjCR+ZGKa5anJYm2OLvka8QLZl86oX7U9g=; b=BshkhqDK1Uqu0HeSjjngFTDBIzh6dDHuA5B2VS3HDzOoA68Sw0a3kWrnI5TmHnurPs bq6OpFMZpfVNYsN5vp5v99has2ljzO5HcPgqObkj+4BvrIe8mzCT3jUOzNcD6PF55Dut TIw8Y/7Tz97R6mPevlx36+D3zVDgasjYv5Wk82qRJk67HvoOnZzNdPbZXTsoRUhutbO9 wwzvxaB9stsIRhncA+V/rmNWoDeEzxlrQTjZLNy+h9rKy33460MN6OA00ZyKGG/Qiqf0 qm1wIn9F/HUt2TjfkOUVt1won8cf3B6vG7PrvgutPXI+q4FCU6T0GdpynfI2ZzjJS5Kk QHIQ== X-Gm-Message-State: ABuFfoh6NVYqct9ecRaChKlaUJonLh++QzxT/6gpcOeSDjAaA3NWDUBZ TAuG8NlMr3bo01NY9azwXJ4MD2zJ X-Google-Smtp-Source: ACcGV61Pm1irBt9MsrK1U1xzcLIbMbPh98idzsXGbLjA7OBbfdh2BEOxXLDucCSxh6N6KAmhTX9x8w== X-Received: by 2002:a1c:c40a:: with SMTP id u10-v6mr17438214wmf.30.1540241185973; Mon, 22 Oct 2018 13:46:25 -0700 (PDT) Received: from arrakeen.fritz.box ([2001:a62:81d:ab01:4936:e72c:acbd:e1bd]) by smtp.gmail.com with ESMTPSA id r134-v6sm9526526wmg.9.2018.10.22.13.46.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 22 Oct 2018 13:46:25 -0700 (PDT) From: Andreas Heiduk To: Git Mailing List Cc: Andreas Heiduk Subject: [PATCH 6/6] doc: fix formatting in git-update-ref Date: Mon, 22 Oct 2018 22:45:46 +0200 Message-Id: <20181022204546.20354-7-asheiduk@gmail.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181022204546.20354-1-asheiduk@gmail.com> References: <20181022204546.20354-1-asheiduk@gmail.com> MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Remove the parapgraph numbers from lines explaining the reflog format and typeset these lines in monospace. Signed-off-by: Andreas Heiduk --- Documentation/git-update-ref.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Documentation/git-update-ref.txt b/Documentation/git-update-ref.txt index fda8516677..9671423117 100644 --- a/Documentation/git-update-ref.txt +++ b/Documentation/git-update-ref.txt @@ -129,8 +129,8 @@ a line to the log file "$GIT_DIR/logs/" (dereferencing all symbolic refs before creating the log name) describing the change in ref value. Log lines are formatted as: - . oldsha1 SP newsha1 SP committer LF -+ + oldsha1 SP newsha1 SP committer LF + Where "oldsha1" is the 40 character hexadecimal value previously stored in , "newsha1" is the 40 character hexadecimal value of and "committer" is the committer's name, email address @@ -138,8 +138,8 @@ and date in the standard Git committer ident format. Optionally with -m: - . oldsha1 SP newsha1 SP committer TAB message LF -+ + oldsha1 SP newsha1 SP committer TAB message LF + Where all fields are as described above and "message" is the value supplied to the -m option.