From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Lars Magne Ingebrigtsen Newsgroups: gmane.emacs.devel Subject: This Is The Git Help Mailing List Date: Thu, 13 Nov 2014 17:06:57 +0100 Organization: Programmerer Ingebrigtsen Message-ID: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1415894853 13020 80.91.229.3 (13 Nov 2014 16:07:33 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 13 Nov 2014 16:07:33 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Nov 13 17:07:28 2014 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 1Xowvg-0007tr-2p for ged-emacs-devel@m.gmane.org; Thu, 13 Nov 2014 17:07:28 +0100 Original-Received: from localhost ([::1]:60739 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xowvf-00052a-Ji for ged-emacs-devel@m.gmane.org; Thu, 13 Nov 2014 11:07:27 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:44897) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XowvW-0004rb-2c for emacs-devel@gnu.org; Thu, 13 Nov 2014 11:07:23 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XowvM-0008S4-LU for emacs-devel@gnu.org; Thu, 13 Nov 2014 11:07:18 -0500 Original-Received: from plane.gmane.org ([80.91.229.3]:36647) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XowvM-0008Rg-B6 for emacs-devel@gnu.org; Thu, 13 Nov 2014 11:07:08 -0500 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1XowvL-0007hQ-Fe for emacs-devel@gnu.org; Thu, 13 Nov 2014 17:07:07 +0100 Original-Received: from cm-84.215.51.58.getinternet.no ([84.215.51.58]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Thu, 13 Nov 2014 17:07:07 +0100 Original-Received: from larsi by cm-84.215.51.58.getinternet.no with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Thu, 13 Nov 2014 17:07:07 +0100 X-Injected-Via-Gmane: http://gmane.org/ Mail-Followup-To: emacs-devel@gnu.org Original-Lines: 48 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: cm-84.215.51.58.getinternet.no Face: iVBORw0KGgoAAAANSUhEUgAAADAAAAAwBAMAAAClLOS0AAAAHlBMVEXLoKL9+PhLHiWjeXH/ ///+//7ryMe9i4b45eSbZWQtn1HnAAACSklEQVQ4jW3UMYvbMBQA4NcarGSrIdd6LM5wZAsVnOsx 4ISsB5eSUaGgaHRrsOLtDK14Y4ghRv+2T85hK0e1RZ+fpPf0FPiau/GZlTyzbvA0nLkZuMGr5pxb R5yHf3p47EFw7WZbYr48jLAWKe8Xanl2ByumeXqLydpuMsKW0bwubUZxbXsPuhKCad3DywAbpgtE NAA1SeVBqSdRFBMxgqfZAJ940UQ0EGVp2+UIr52K8sjFGJHdA0a3CCPrtpgNJRFnREWLoYQwaKsx QlzRKIxiOpY8+gDfjShUFEtml2zuHTc8oSxC2pk2APs0wKqYGNYSAEWAl+BqqczRVihZlrRFN8I2 VYaloRKBXaSQVkMRt5kywlaKImwHeoRNNkF5DpWkK0mhHDffZCfaOJRU905D7cOVyicJQBfMXocE f9RUElQOANjl/A4oP5qHaeLDvCGQLgA+JmfXWDDvYdG4krPCgz6PqW2otJJAwu+kewdSMk3wzYfA Hga4eLAP7IcoFjDVINjlPuJEEaJMAYLE23wV2CtFsLqjjkuSMfPVz9pBkLUOFmPDrUV5bujCS4q4 JAuvqemaVCy07Qrau/XeR3xcKpQB74ogWZz/jrA3jFqBXgFML4tq5j01yu5W3Np26sV7nHuJ/VVJ 6okm9yCPVfR2Japfaf0G67VrdXRv5yH3Ic+f3TPI893L7ecKHrf7UKqDovUfEGNsmgbjGAk2X05S /IJKw8wYSSegppDSwUGhiaWRaoYK+26hD57f/mTuxm692+3/B31i/wCWeVakhdZmeQAAAABJRU5E rkJggg== Mail-Copies-To: never X-Now-Playing: Laetitia Sadier's _Something Shines_: "Oscuridad" User-Agent: Gnus/5.130012 (Ma Gnus v0.12) Emacs/25.0.50 (gnu/linux) Cancel-Lock: sha1:9EGematqO9XX1+HNUNMPwZ9tI9M= X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 80.91.229.3 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:176937 Archived-At: So, I had some locally checked-in changes that I wanted to push. So I said "git push". [larsi@stories ~/src/emacs]$ git push Warning: No xauth data; using fake authentication data for X11 forwarding. X11 forwarding request failed on channel 0 To larsi@git.sv.gnu.org:/srv/git/emacs.git ! [rejected] master -> master (non-fast-forward) error: failed to push some refs to 'larsi@git.sv.gnu.org:/srv/git/emacs.git' hint: Updates were rejected because the tip of your current branch is behind hint: its remote counterpart. Merge the remote changes (e.g. 'git pull') hint: before pushing again. hint: See the 'Note about fast-forwards' in 'git push --help' for details. Ok, so I tried what I always do in the Gnus repo when this happens, which usually fixes everything. [larsi@stories ~/src/emacs]$ git pull --rebase Cannot pull with rebase: You have unstaged changes. Please commit or stash them. Err... Ok, how about just "git pull" like it says? [larsi@stories ~/src/emacs]$ git pull Warning: No xauth data; using fake authentication data for X11 forwarding. X11 forwarding request failed on channel 0 remote: Counting objects: 29, done. remote: Compressing objects: 100% (13/13), done. remote: Total 13 (delta 10), reused 0 (delta 0) Unpacking objects: 100% (13/13), done. >From git.sv.gnu.org:/srv/git/emacs 38fa4bc..d856e6b master -> origin/master e18c2a5..3d08bc4 emacs-24 -> origin/emacs-24 error: Your local changes to the following files would be overwritten by merge: lisp/ChangeLog Please, commit your changes or stash them before you can merge. Aborting Errr... What is the magic sequence of magic git commands that I should use now? -- (domestic pets only, the antidote for overdose, milk.) bloggy blog: http://lars.ingebrigtsen.no