From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Yuri Khan Newsgroups: gmane.emacs.devel Subject: Re: VC mode and git Date: Sun, 5 Apr 2015 20:15:35 +0600 Message-ID: References: <5511998E.8080309@cs.ucla.edu> <5512F8C7.7010509@math.ntnu.no> <5513F889.4000404@math.ntnu.no> <55212DE9.8070806@math.ntnu.no> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Trace: ger.gmane.org 1428243377 6822 80.91.229.3 (5 Apr 2015 14:16:17 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 5 Apr 2015 14:16:17 +0000 (UTC) Cc: Paul Eggert , "rms@gnu.org" , Emacs developers To: Harald Hanche-Olsen Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Apr 05 16:16:16 2015 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1YelLS-0007U2-O8 for ged-emacs-devel@m.gmane.org; Sun, 05 Apr 2015 16:16:15 +0200 Original-Received: from localhost ([::1]:36622 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YelLR-0003kV-Ju for ged-emacs-devel@m.gmane.org; Sun, 05 Apr 2015 10:16:13 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:55260) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YelLD-0003kO-Il for emacs-devel@gnu.org; Sun, 05 Apr 2015 10:16:00 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YelLC-0004vV-QG for emacs-devel@gnu.org; Sun, 05 Apr 2015 10:15:59 -0400 Original-Received: from mail-lb0-x22c.google.com ([2a00:1450:4010:c04::22c]:33144) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YelLB-0004vH-Ae; Sun, 05 Apr 2015 10:15:57 -0400 Original-Received: by lbbzk7 with SMTP id zk7so6572360lbb.0; Sun, 05 Apr 2015 07:15:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc:content-type:content-transfer-encoding; bh=0D12EPnfl4ok4K+s48sAbkAq9HiQEZ4uPNg63ON0v6I=; b=fWNIktp5TlxFxHYHAburRtNz4NpyM/ig7yLFRlt3HmGWbxcnIRzXz+zoSIKM6YT83F PJkZFzI43kZtNs+cawk9x1QIF0gY84ma6cwis8MtOjpeZmrufYFBagbieVLyR8KNA7/M P1FIbDBJBkVx+EunrE6tCN090ZJgdeid/G7tUoEz87q6qMMb1h/8KV27nphkSeRW4gaK pHQRt8NN8OVYuYpn6l/bCxFmIvXbffAThTfNojWufFNv6gLIBJLI4jqtNww+ansdogMP 9Qx/7b/nY7ozxWBVLZjwEn5w6jkHTo0VgY/tGP1tpFmFWpPFzKS/rioI26xV2eosuomq wJlw== X-Received: by 10.112.93.72 with SMTP id cs8mr5740581lbb.15.1428243355867; Sun, 05 Apr 2015 07:15:55 -0700 (PDT) Original-Received: by 10.114.71.200 with HTTP; Sun, 5 Apr 2015 07:15:35 -0700 (PDT) In-Reply-To: <55212DE9.8070806@math.ntnu.no> X-Google-Sender-Auth: JU_KL_vSk6-C9yhD8KW5GPSu77U X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:4010:c04::22c X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:184932 Archived-At: On Sun, Apr 5, 2015 at 6:43 PM, Harald Hanche-Olsen w= rote: > git diff f1cea3e dca743f | patch -p1 > > (Though I think git has better builtin commands than the above pipeline i= nto > patch; I just don't know them.) This is spelled =E2=80=9Cgit cherry-pick f1cea3e..dca743f=E2=80=9D, althoug= h it will also put you into conflict resolution mode if conflicts occur. > git reset --hard origin/master > git pull > git diff f1cea3e dca743f | patch -p1 > # edit lisp/Changelog > git commit -a This is roughly equivalent to fetching and then rebasing the branch containing f1cea3e..dca743f onto origin/master. (If f1cea3e and dca743f are more than one commit apart, your recipe would combine them into a single commit. To achieve the same effect in Git, one uses =E2=80=9C= git rebase --interactive=E2=80=9D with the =E2=80=9Csquash=E2=80=9D or =E2=80= =9Cfixup=E2=80=9D action.)