From: Marco Roeland <marco.roeland@xs4all.nl>
To: moreau francis <francis_moreau2000@yahoo.fr>
Cc: Junio C Hamano <junkio@cox.net>, git@vger.kernel.org
Subject: Re: How should I handle binary file with GIT
Date: Wed, 5 Apr 2006 21:23:21 +0200 [thread overview]
Message-ID: <20060405192321.GA20854@fiberbit.xs4all.nl> (raw)
In-Reply-To: <20060405131834.60888.qmail@web25804.mail.ukl.yahoo.com>
On Wednesday April 5th 2006 moreau francis wrote:
> BTW, what does "--amend" option do ? It doesn't seem to be documented anywhere.
This is the original commit text that introduced it:
diff-tree b4019f045646b1770a80394da876b8a7c6b8ca7b (from d320a5437f8304cf9ea3ee1898e49d643e005738)
Author: Junio C Hamano <junkio@cox.net>
Date: Thu Mar 2 21:04:05 2006 -0800
git-commit --amend
The new flag is used to amend the tip of the current branch. Prepare
the tree object you would want to replace the latest commit as usual
(this includes the usual -i/-o and explicit paths), and the commit log
editor is seeded with the commit message from the tip of the current
branch. The commit you create replaces the current tip -- if it was a
merge, it will have the parents of the current tip as parents -- so the
current top commit is discarded.
It is a rough equivalent for:
$ git reset --soft HEAD^
$ ... do something else to come up with the right tree ...
$ git commit -c ORIG_HEAD
but can be used to amend a merge commit.
Signed-off-by: Junio C Hamano <junkio@cox.net>
So in the original context you can add separate binaries to a commit
of only text files that you just rescued from CVS or something and then
change the commit to include these binaries as well.
I've sent a separate patch for the documentation for git-commit using
Junio's clear explanation.
--
Marco Roeland
next prev parent reply other threads:[~2006-04-05 19:23 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-04-05 7:30 How should I handle binary file with GIT moreau francis
2006-04-05 8:14 ` Junio C Hamano
2006-04-05 12:21 ` moreau francis
2006-04-05 13:25 ` Nicolas Pitre
2006-04-05 13:35 ` moreau francis
2006-04-05 13:06 ` Nicolas Pitre
2006-04-05 13:18 ` moreau francis
2006-04-05 19:23 ` Marco Roeland [this message]
2006-04-05 15:11 ` Jakub Narebski
2006-04-05 15:32 ` Nicolas Pitre
2006-04-05 15:37 ` Randal L. Schwartz
2006-04-05 15:55 ` Shawn Pearce
2006-04-05 16:25 ` Nicolas Pitre
2006-04-05 16:21 ` Nicolas Pitre
2006-04-05 18:34 ` Junio C Hamano
2006-04-05 18:51 ` Randal L. Schwartz
2006-04-05 19:31 ` Nicolas Pitre
2006-04-05 20:20 ` Junio C Hamano
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=20060405192321.GA20854@fiberbit.xs4all.nl \
--to=marco.roeland@xs4all.nl \
--cc=francis_moreau2000@yahoo.fr \
--cc=git@vger.kernel.org \
--cc=junkio@cox.net \
/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.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox