emacs-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: master 47070ed 6/6: Merge branch 'master' of git.sv.gnu.org:/srv/git


From: Richard Stallman
Subject: Re: master 47070ed 6/6: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
Date: Sun, 16 May 2021 00:37:21 -0400

[[[ To any NSA and FBI agents reading my email: please consider    ]]]
[[[ whether defending the US Constitution against all enemies,     ]]]
[[[ foreign or domestic, requires you to follow Snowden's example. ]]]

  > Do you remember the question it asked?  Was it something like the
  > below?

  >   # Please enter a commit message to explain why this merge is necessary,
  >   # especially if it merges an updated upstream into a topic branch.
  >   #
  >   # Lines starting with '#' will be ignored and an empty message aborts
  >   # the commit.

I think so.

  > If so, this is not really a question you need to answer.  The line
  > above it is the merge-commit log message Git prepares for you (it
  > probably said something like "Merge branch 'master' of
  > git.sv.gnu.org:/srv/git/emacs"),

It was not obvious to me that the text above constitutes a possible answer.
I thought it was simply information being shown to me.


                                     so basically all you need to do is
  > "C-c C-c" to let Git use that standard message and proceed with the
  > merge.

-- 
Dr Richard Stallman (https://stallman.org)
Chief GNUisance of the GNU Project (https://gnu.org)
Founder, Free Software Foundation (https://fsf.org)
Internet Hall-of-Famer (https://internethalloffame.org)





reply via email to

[Prev in Thread] Current Thread [Next in Thread]