From: Theodore Ts'o <tytso@mit.edu>
To: Sergey Organov <sorganov@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: git rebase: yet another newbie quest.
Date: Mon, 8 Sep 2014 10:07:58 -0400 [thread overview]
Message-ID: <20140908140758.GI1066@thunk.org> (raw)
In-Reply-To: <87sik28bir.fsf@osv.gnss.ru>
On Mon, Sep 08, 2014 at 05:52:44PM +0400, Sergey Organov wrote:
>
> I didn't intend to make topic branch from the very beginning, and
> already made a commit or two on the remote tracking branch bofore I
> realized I'd better use topic branch. It'd create no problem as far as I
> can see, provided vanilla "git rebase" has "sane" defaults. That said,
> I've already been once pointed to by Junio that my definition of "sane"
> doesn't take into account workflows of others, so now I try to be
> carefull calling vanilla "git rebase" names.
Right, so what I typically in that situation is the following:
<on the master branch>
<hack hack hack>
git commit
<hack hack hack>
git commit
<oops, I should have created a topic branch>
git checkout -b topic-branch
git branch -f master origin/msater
This resets the master branch to only have what is in the upstream
commit.
> Please also notice that I didn't pull immediately after I've re-arranged
> my branches, and this fact only made it more difficult to find and
> isolate the problem.
It's also the case that I rarely will do a "git rebase" without taking
a look at the branches to make sure it will do what I expect. I'll do
that using either "gitk" or "git lgt", where git lgt is defined in my
.gitconfig as:
[alias]
lgt = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset' --abbrev-commit
And typically what I will do is something like this:
gitk -20 master origin/master topic
-or-
git lgt -20 master origin/master topic
The "git lgt" command is very handy when I want to see how the
branches are arranged, and I'm logged remotely over ssh/tmux or some
such, so gitk isn't really available to me.
Cheers,
- Ted
next prev parent reply other threads:[~2014-09-08 14:08 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-05 10:28 git rebase: yet another newbie quest Sergey Organov
2014-09-05 15:41 ` Theodore Ts'o
2014-09-08 13:52 ` Sergey Organov
2014-09-08 14:07 ` Theodore Ts'o [this message]
2014-09-08 15:47 ` Sergey Organov
2014-09-08 17:32 ` Theodore Ts'o
2014-09-08 19:49 ` Sergey Organov
2014-09-05 22:13 ` John Keeping
2014-09-08 13:51 ` Sergey Organov
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=20140908140758.GI1066@thunk.org \
--to=tytso@mit.edu \
--cc=git@vger.kernel.org \
--cc=sorganov@gmail.com \
/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 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.