all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Bill Wohler <wohler@newt.com>
To: Eli Zaretskii <eliz@gnu.org>
Cc: emacs-devel@gnu.org
Subject: Re: About git commits
Date: Sun, 31 Jan 2016 12:49:36 -0800	[thread overview]
Message-ID: <100495.1454273376@olgas.newt.com> (raw)
In-Reply-To: <83io291pnl.fsf@gnu.org>

Eli Zaretskii <eliz@gnu.org> wrote:

> > From: Bill Wohler <wohler@newt.com>
> > Date: Sun, 31 Jan 2016 11:57:14 -0800
> > 
> > Nicolas Petton <nicolas@petton.fr> writes:
> > 
> > > Hi guys,
> > >
> > > I'm preparing the pretest, and there are quite a few git commit messages
> > > that refer to files without their path, I fixed like 50 of them last
> > > week already, but there are more entries to be fixed.
> > 
> > Isn't that going to screw up everybody's history?
> 
> How can it screw up history?  History is immutable.

No, it is not.

Log messages are fixed using git rebase -i, which rewrites all of the
commits from the changed commit to HEAD.

See https://git-scm.com/book/en/v2/Git-Tools-Rewriting-History

See also the section RECOVERING FROM UPSTREAM REBASE in the git rebase
man page. If Nicolas used rebase on commits that had already been
pushed, all of us will likely have to follow these instructions, or
clone a new repository if we can.

-- 
Bill Wohler <wohler@newt.com> aka <Bill.Wohler@nasa.gov>
http://www.newt.com/wohler/
GnuPG ID:610BD9AD



  reply	other threads:[~2016-01-31 20:49 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-01-30 10:21 About git commits Nicolas Petton
2016-01-31 19:57 ` Bill Wohler
2016-01-31 20:04   ` Eli Zaretskii
2016-01-31 20:49     ` Bill Wohler [this message]
2016-01-31 21:28       ` Dmitry Gutov
2016-01-31 23:03         ` Bill Wohler
2016-02-01  3:07           ` Xue Fuqiao
2016-02-01  3:40           ` Eli Zaretskii
2016-02-01  5:15             ` Bill Wohler

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=100495.1454273376@olgas.newt.com \
    --to=wohler@newt.com \
    --cc=eliz@gnu.org \
    --cc=emacs-devel@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/emacs.git
	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.