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=-3.9 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, 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 6E51A1F463 for ; Sat, 23 Nov 2019 20:50:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726833AbfKWUuv (ORCPT ); Sat, 23 Nov 2019 15:50:51 -0500 Received: from mail-wm1-f65.google.com ([209.85.128.65]:40834 "EHLO mail-wm1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726792AbfKWUuu (ORCPT ); Sat, 23 Nov 2019 15:50:50 -0500 Received: by mail-wm1-f65.google.com with SMTP id y5so11531168wmi.5 for ; Sat, 23 Nov 2019 12:50:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=hHFvvbIn1O6VwxZ7J7VuwfsfwCwc0My19qUDxtb0A1A=; b=ocztfXI7FpwcUR7+AG/n11iMvVhWij2R+ItBkPZZvs8ct6/qA+gDcXEEX59wDU81kd G8auQbQhq7jbsblZa/oEMUUufr6I25o3DjOuZ8YlTBOYiOMkIIXtuqw4XViAuJUeJ6U2 zs6txJr9pQIlxJF1EL/OX3gO488uWNzu3ujCXrZO9ZRXkJGejW6CEuVbzMEYXubmck9H F1MSPbgV3RwNEzy3h9i6d/hGH9kwXs8WGNdFt0bzTP9C57wt18ej2X6hAVp0VjWrL7/l 35sp78u1MO7VzOjkFvGlFooBO5cMcMaJ3/aRZZF00XfCNHmJ6xh6zwZkJIwM2DWwwSzS q+1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=hHFvvbIn1O6VwxZ7J7VuwfsfwCwc0My19qUDxtb0A1A=; b=XzSb05ydhpBFEzUL/72lzAW1oKghMsJUd566C0w6mp9g03v5AfwZaOSpUDi8IDDgMQ TY5s7czRpMwFeZDg5D3TQIggMRgry6POZMypwVLcSM1xGd+7jPI136rEpA9V2yGqMphV mqoMWgM3BpvCfJfj0bgeRJBEAL4H6HNrocako5a1Q/ZSTFHbmfH5pFV5gkdc+Sh/0dYd anEtN8sg3N+JWRPXiVkkXYig9OEuEYoo7xo/TYj+EM8Oujp5oSOQuEG/TFIWGgPrjl0G xZ7m+bcuwbzGNQ+PWCIIBF8LNZWlWO3aCYTxR+aHZYfzlbwTEMMHhY6vx9ORAb3JlyiK goYA== X-Gm-Message-State: APjAAAXaiQKshzIOGC7cZIu46/txPGp5CbJnEbpvGf+mSEH0Kd58hkdB 6++ELKyxuz04NKdrFa9j7TUum3Sr X-Google-Smtp-Source: APXvYqxaM29JGxJsFj0ELHOSfmxWdiq21DHhiHrQiI4Zaw0I6hpx2RuAbM/ZCUmoKRhg5d0SNuL1wQ== X-Received: by 2002:a05:600c:230d:: with SMTP id 13mr1782738wmo.13.1574542248578; Sat, 23 Nov 2019 12:50:48 -0800 (PST) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id u203sm3007117wme.34.2019.11.23.12.50.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 23 Nov 2019 12:50:48 -0800 (PST) Message-Id: In-Reply-To: References: From: "Johannes Schindelin via GitGitGadget" Date: Sat, 23 Nov 2019 20:50:40 +0000 Subject: [PATCH 6/8] git-svn: drop support for `--preserve-merges` Fcc: Sent Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit MIME-Version: 1.0 To: git@vger.kernel.org Cc: Johannes Schindelin , Junio C Hamano , Johannes Schindelin Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Johannes Schindelin We already passed the `--rebase-merges` option to `git rebase` instead, now we make this move permanent. Signed-off-by: Johannes Schindelin --- Documentation/git-svn.txt | 1 - git-svn.perl | 1 - 2 files changed, 2 deletions(-) diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt index 6624a14fbd..6cfd48c9d3 100644 --- a/Documentation/git-svn.txt +++ b/Documentation/git-svn.txt @@ -678,7 +678,6 @@ config key: svn.authorsProg --strategy=:: -p:: --rebase-merges:: ---preserve-merges (DEPRECATED):: These are only used with the 'dcommit' and 'rebase' commands. + Passed directly to 'git rebase' when using 'dcommit' if a diff --git a/git-svn.perl b/git-svn.perl index 4aa208ff5f..f1fa1bc7f7 100755 --- a/git-svn.perl +++ b/git-svn.perl @@ -271,7 +271,6 @@ sub _req_svn { 'fetch-all|all' => \$_fetch_all, 'dry-run|n' => \$_dry_run, 'rebase-merges|p' => \$_rebase_merges, - 'preserve-merges|p' => \$_rebase_merges, %fc_opts } ], 'commit-diff' => [ \&cmd_commit_diff, 'Commit a diff between two trees', -- gitgitgadget