git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: linux@horizon.com
To: git@vger.kernel.org
Subject: Why can't git-rebase back up?
Date: 17 Feb 2006 08:59:38 -0500	[thread overview]
Message-ID: <20060217135938.7412.qmail@science.horizon.com> (raw)

Newbie question...  In what I assume is a usual technique, I maintain a
"build" branch off of the linux-2.6 history which is what I check out
to build a kernel.  I usually keep it at an official tagged releas,
such as v2.6.16-rc2.

[[ This is because core git won't allow the checked-out HEAD to point
to anything but a branch, and checking out something without having
HEAD point to it is fragile and delicate.  Cogito lets you do this with
cg-seek. ]]

Now, if I want to migrate to a newer base version, I can always use
git-reset --hard v2.6.16-rc3, but that's a bit dangerous.
Preferable is to use git-rebase v2.6.16-rc3, which will preserve
any local edits.

(I could also do it as a merge, but that seems like unnecessary history
clutter.  It's not like local edits are common, anyway.)

But suppose discover a nasty bug in -rc3 and want to move my build branch
back to -rc2.  "git-rebase v2.6.16-rc2" does nothing.  After a bit
of thought, I realize why, but sometime I do want to back up.

What's the best way to do that?  Should git-rebase take an optional
third argument which is the branch head we are moving away from?
E.g. what I want to do would be

	git-rebase v2.6.16-rc2 build v2.6.16-rc3

Or is there some other tool already suited to the job?

(Yes, I'm aware the operations cannot be exact inverses, because if
I applied a local patch that was also included in -rc3, git-rebase
will delete the redundant copy from the build branch, and the backing
up will have no way to know to put it back.  If I wanted to do that,
I would use a merge.)


On a completely unrelated note, how do I find out what git thinks of a
particular file, such as linux-2.6/.config?  It isn't listed in the
output of git-status or git-ls-files, but git-ls-files -i produces an error.
Very confusingly,
git-ls-files -i --exclude-per-directory=.gitignore -X .git/info/exclude .config
also produces no output, even though .* is listed in .gitignore.

             reply	other threads:[~2006-02-17 14:00 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-02-17 13:59 linux [this message]
2006-02-17 14:36 ` Why can't git-rebase back up? Andreas Ericsson
2006-02-17 15:34   ` linux
2006-02-17 16:30     ` Andreas Ericsson
2006-02-18  7:39       ` Junio C Hamano
2006-02-18  7:39 ` Junio C Hamano
2006-02-18  8:56   ` linux
2006-02-18  9:15     ` Junio C Hamano
2006-02-18 13:00       ` linux
2006-02-18 14:53         ` Johannes Schindelin

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=20060217135938.7412.qmail@science.horizon.com \
    --to=linux@horizon.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.
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 NNTP newsgroup(s).