From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-4.0 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id 8F9771F487 for ; Sat, 28 Mar 2020 19:12:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727167AbgC1TMG (ORCPT ); Sat, 28 Mar 2020 15:12:06 -0400 Received: from mail-ed1-f66.google.com ([209.85.208.66]:44138 "EHLO mail-ed1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725807AbgC1TMF (ORCPT ); Sat, 28 Mar 2020 15:12:05 -0400 Received: by mail-ed1-f66.google.com with SMTP id i16so14903981edy.11 for ; Sat, 28 Mar 2020 12:12:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:from:date:subject:fcc:content-transfer-encoding :mime-version:to:cc; bh=TP/t8abvwbdSbpPptCMi0q/i+qfxKylhr1YN92phcrM=; b=CoLux7KhPc6p/u9Po/suZ0CTxnejIdY76CBvXIbtnDLfQJw2BLk4HM7PY0IWZ3kffn upWZbastodmOzZNdRrXvPKhioOZVgR8gap45JfH4a7uqAOgWBpH5zjQ4labJjZxG5OiV BYAdADDrFYOaIjX033HOmYixoOUIBjgZrRkjNCmthiwQVF5BXqgt8QCZ7I85VMUEV6wr 02RrlPD0AupXqEWkqpEZeKBbzYZCM/Q/evG1/+feho/lMM0cg/7g3MljEelSuWW0MuKz 1BmFr198FLydEwQVreb275mkaJoEx+TQ6XDo7/cPxhDXl9S1tT+JCqqpbjef2KSK5UUq ihrQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=TP/t8abvwbdSbpPptCMi0q/i+qfxKylhr1YN92phcrM=; b=AHDUKGVc+DxZkz6j+eLVr59sxiUVnD7vwceqSz+5/WAUoPpBZjmoJM0uU5z6ln7ZBi 7QVFw9RujO/nMF+Mf+wwqLEE4xxg26b1bwq7PmZVNZRRCXEkj9Ip3tSrtZl7I+5LtBqZ VWU4zHacQnlUXVSfR3v/+gZXSLjIOwANwle4fwSntth6yFTeEo924/cPhGi9jBAff9To ncCXCHe9ceWsNncAKaPYbFQYUHN2EjfQ0aCnhMqSNhsCZPYi+st4nVpOUksIvwgnErdp rWEF3bnzimBhGyYQ0v104tfOy6ZHNEFGQaE8rK00Rs0or6X0O7QzeXtHV/mT4c4CQnZv mFTQ== X-Gm-Message-State: ANhLgQ3i2YUCqABZTdQUoUl/rUmjvDF9MICnvUvr/PMN/nYoXLUDSA8U sTDtwuGwXWR+2Evp4wuS8NygiQGr X-Google-Smtp-Source: ADFU+vtZdamTbVmVXxUCZKC1kG7bVdPGNUryjDA2+lUc+XGTmjBLmycBzRzfXOc5LFotKhcRS+LClQ== X-Received: by 2002:a50:9661:: with SMTP id y88mr4665334eda.357.1585422721852; Sat, 28 Mar 2020 12:12:01 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id k9sm1284741edl.35.2020.03.28.12.12.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 28 Mar 2020 12:12:01 -0700 (PDT) Message-Id: From: "Philippe Blain via GitGitGadget" Date: Sat, 28 Mar 2020 19:12:00 +0000 Subject: [PATCH] git-rebase.txt: fix typo Fcc: Sent Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit MIME-Version: 1.0 To: git@vger.kernel.org Cc: Philippe Blain , Philippe Blain Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Philippe Blain Signed-off-by: Philippe Blain --- git-rebase.txt: fix typo CC: Junio C Hamano gitster@pobox.com [gitster@pobox.com], Elijah Newren newren@gmail.com [newren@gmail.com] Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-740%2Fphil-blain%2Fdoc-rebase-typo-v1 Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-740/phil-blain/doc-rebase-typo-v1 Pull-Request: https://github.com/git/git/pull/740 Documentation/git-rebase.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index f7a6033607f..46ddf172d9c 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -605,7 +605,7 @@ BEHAVIORAL DIFFERENCES ----------------------- git rebase has two primary backends: apply and merge. (The apply -backend used to known as the 'am' backend, but the name led to +backend used to be known as the 'am' backend, but the name led to confusion as it looks like a verb instead of a noun. Also, the merge backend used to be known as the interactive backend, but it is now used for non-interactive cases as well. Both were renamed based on base-commit: 3bab5d56259722843359702bc27111475437ad2a -- gitgitgadget