From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Lars Ingebrigtsen Newsgroups: gmane.emacs.devel Subject: Re: master bdda935 2/2: Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs Date: Mon, 17 Aug 2020 20:03:58 +0200 Message-ID: <877dtxp2sx.fsf@gnus.org> References: <20200816182558.16607.52991@vcs0.savannah.gnu.org> <20200816182601.16F2A209AC@vcs0.savannah.gnu.org> <87imdisam3.fsf@gnus.org> <83k0xxgt81.fsf@gnu.org> <0c69fb1c-330c-efcf-6005-95117bba9057@cs.ucla.edu> <87lfidp7bd.fsf@gnus.org> <837dtxgpyz.fsf@gnu.org> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="3520"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) Cc: rpluim@gmail.com, eggert@cs.ucla.edu, emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Mon Aug 17 20:04:55 2020 Return-path: Envelope-to: ged-emacs-devel@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1k7jV8-0000l5-LB for ged-emacs-devel@m.gmane-mx.org; Mon, 17 Aug 2020 20:04:54 +0200 Original-Received: from localhost ([::1]:38184 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7jV7-0005bH-I0 for ged-emacs-devel@m.gmane-mx.org; Mon, 17 Aug 2020 14:04:53 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:38786) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7jUR-000539-78 for emacs-devel@gnu.org; Mon, 17 Aug 2020 14:04:11 -0400 Original-Received: from quimby.gnus.org ([2a01:4f9:2b:f0f::2]:41128) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7jUO-00014X-4H; Mon, 17 Aug 2020 14:04:10 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnus.org; s=20200322; h=Content-Type:MIME-Version:Message-ID:In-Reply-To:Date: References:Subject:Cc:To:From:Sender:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=f3kkc/9Hkw8CCuW+DtTf8eDMXfFxt2rse2iZHARUcjQ=; b=jC4k3wT5qQzNEBpDLdAJHA29kM tD2YgHcKJF/ogclVv8UaeBhBxpCRVQm3buszGh5SsWRFjZKNNQZ68McPRU5tcI/fekuHw1viM/VsW hBQZ/gNBJPR6NOYh17nwOzQEsLr65XsyJokXX6SV8nusQS1SU+gF82X45C7BuTiKIIHk=; Original-Received: from cm-84.212.202.86.getinternet.no ([84.212.202.86] helo=xo) by quimby with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1k7jUG-0005FP-7T; Mon, 17 Aug 2020 20:04:03 +0200 Face: iVBORw0KGgoAAAANSUhEUgAAADAAAAAwBAMAAAClLOS0AAAABGdBTUEAALGPC/xhBQAAACBj SFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAD1BMVEXFuZpoXF3Am2OU cEH///9sZGuXAAAAAWJLR0QEj2jZUQAAAAd0SU1FB+QIERIAOkB6JqMAAAFxSURBVDjLtZPrkcMw CISxKgimAT0aCNB/b7cgJbY8dz9Pk5kkfGYXEKaD6EV/nL/AQf8GClEt/cLv78/eS+/fko7XJzrP F+g5dcoDFBWqCSoloz59DpePM9RqAHzhnyrXeLjQ0krg5upq8XBZFVQy7y4qrgxQIhlyEziAM/O5 HBIQufhgWWCdmsChkkdmrEQCACMu+CwwW69oCQGHkMhYcyvZRQBPIesT1NUlgKZSH9ekaQIPqTOU HyCMlbUZn+22GBl39sbtre11AQ0iYk1aP5QvEFFkKI5xO25SLuHAOk54lJuUex+CEecK3EpGsYaK zWuAegcGBza3viWEFIpVeReiDXjMHXPMi733jpjHOEZe3gOU9eQTWLdI6mUDUW74WI0l2TPG8Gm0 AYQGmiixa+Uh5dFd3OkOJIXM1hJfAIMaUqf8BrC2yGJ+1hsN5jaqPIYoc1gyJ3P3iPlmnm0AFy6/ AiQgqtPpAdaN4G17X+4/4FBLfdXAE18AAAAldEVYdGRhdGU6Y3JlYXRlADIwMjAtMDgtMTdUMTg6 MDA6NTgrMDA6MDDDYTpZAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDIwLTA4LTE3VDE4OjAwOjU4KzAw OjAwsjyC5QAAAABJRU5ErkJggg== X-Now-Playing: Jim Black Trio's _Reckon_: "Spooty and Snofer" In-Reply-To: <837dtxgpyz.fsf@gnu.org> (Eli Zaretskii's message of "Mon, 17 Aug 2020 20:08:20 +0300") Received-SPF: pass client-ip=2a01:4f9:2b:f0f::2; envelope-from=larsi@gnus.org; helo=quimby.gnus.org X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.23 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-mx.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.io gmane.emacs.devel:253904 Archived-At: Eli Zaretskii writes: > Please don't. It can cause subtle problems in some rare cases. Or at > least that's how it was in the past. If so, it's changed. There's nothing magical much about rebasing: It's just removing any local check-ins that are newer than the remote, fetching the remote, and then re-applying those removed check-ins as new check-ins. Like I said, I use rebasing all the time, and how many commits have I made? larsi@xo:~/src/emacs/trunk$ git log | grep Commit:.*Ingebrigtsen* | wc -l 3217 Well, OK, some of them are from before we moved to git, but... Seems pretty safe to me. -- (domestic pets only, the antidote for overdose, milk.) bloggy blog: http://lars.ingebrigtsen.no