From: Andy Parkins <andyparkins@gmail.com>
To: git@vger.kernel.org
Subject: Re: changing log entries
Date: Thu, 14 Dec 2006 10:37:34 +0000 [thread overview]
Message-ID: <200612141037.35061.andyparkins@gmail.com> (raw)
In-Reply-To: <1166051281.1808.1.camel@jcm.boston.redhat.com>
On Wednesday 2006 December 13 23:08, Jon Masters wrote:
> Anyway, now I would like to change an existing log entry to make it a
> bit cleaner (read: add a first line that's under 80 characters). What's
> the best way to change an existing log entry for a commit?
If it's HEAD you want to change:
git-commit --amend
If it's not, it's a bit harder. You could pull each commit out as a patch and
apply them again later after a git-reset. However, git has a tool for
automating a lot of that: git-rebase. man git-rebase has some excellent
examples.
* -- A -- B -- C (master)
Let's say you want to edit A; make a new branch at A:
$ git branch temp-edit-branch master^^
* -- A (temp-edit-branch)
\
B -- C (master)
Edit A with git-commit --amend. This makes a new A, A' that has the new
commit message:
* -- A' (temp-edit-branch)
\
A -- B -- C (master)
Then you switch to "master" and rebase master onto temp-edit-branch; you can
then delete temp-edit-branch
$ git-checkout master
$ git-rebase temp-edit-branch
$ git branch -D temp-edit-branch
* -- A' -- B' -- C' (master)
\
A -- B -- C
Note that A-B-C are now dangling commits; a git-prune would be needed to clean
them out of the repository.
The important thing to realise is that you can never really edit a commit.
The best you can do is reapply it. In this example, the fact that B' makes
the same change as B is irrelevant - they are two separate commits.
Note: this is only workable if you haven't pushed this branch to another
repository. The other repository would retain the original A--B--C branch
and you will get "won't fast forward" errors if you try to push the
new "A'--B'--C'" branch.
Andy
--
Dr Andy Parkins, M Eng (hons), MIEE
next prev parent reply other threads:[~2006-12-14 10:37 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-12-13 23:08 changing log entries Jon Masters
2006-12-13 23:22 ` Jakub Narebski
2006-12-13 23:24 ` Shawn Pearce
2006-12-14 10:37 ` Andy Parkins [this message]
2006-12-15 8:48 ` Jakub Narebski
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200612141037.35061.andyparkins@gmail.com \
--to=andyparkins@gmail.com \
--cc=git@vger.kernel.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 public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).