From: Pete Wyckoff <pw@padd.com>
To: git@vger.kernel.org
Subject: tracking branch for a rebase
Date: Fri, 4 Sep 2009 06:54:14 -0700 [thread overview]
Message-ID: <20090904135414.GA3728@honk.padd.com> (raw)
I received an interesting question today.
If "git pull" knows what remote tracking brach to pull from,
why doesn't "git rebase" automatically know I want to rebase
on top of my remote tracking branch?
He had done a "git remote update", reviewed the changes, and now
wants to rebase his changes on top of the new upstream.
I told him about git pull --rebase, and branch.name.rebase,
but didn't have an easy answer to the "what is my remote tracking
branch" question in this case.
All the information is in git config branch.name.{remote,merge},
but I can't find anything that just answers that question. Nor
did I have a good answer for why "git rebase" doesn't just default
to rebasing the current branch on top of the tracking branch.
Thoughts?
-- Pete
next reply other threads:[~2009-09-04 13:54 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-09-04 13:54 Pete Wyckoff [this message]
2009-09-04 14:31 ` tracking branch for a rebase Michael J Gruber
2009-09-04 18:18 ` Jeff King
2009-09-04 18:59 ` Björn Steinbrink
2009-09-05 6:12 ` Jeff King
2009-09-05 14:01 ` Björn Steinbrink
2009-09-05 14:28 ` Jeff King
2009-09-07 5:05 ` Junio C Hamano
2009-09-07 8:14 ` Michael J Gruber
2009-09-07 8:25 ` Junio C Hamano
2009-09-07 8:44 ` Jeff King
2009-09-07 9:06 ` Michael J Gruber
2009-09-07 8:43 ` Jeff King
2009-09-07 9:29 ` Johannes Schindelin
2009-09-07 9:53 ` Michael J Gruber
2009-09-08 23:17 ` Julian Phillips
2009-09-09 10:45 ` Jeff King
2009-09-10 6:42 ` Junio C Hamano
2009-09-10 7:47 ` Johannes Schindelin
2009-09-10 9:36 ` [PATCH] Introduce <branch>@{tracked} as shortcut to the tracked branch Johannes Schindelin
2009-09-10 9:44 ` Michael J Gruber
2009-09-10 10:14 ` Johannes Schindelin
2009-09-10 10:18 ` Johan Herland
2009-09-10 10:59 ` Michael J Gruber
2009-09-10 12:29 ` Johan Herland
2009-09-10 13:35 ` Johannes Schindelin
2009-09-10 14:17 ` Michael J Gruber
2009-09-10 11:11 ` Jeff King
2009-09-10 18:29 ` Junio C Hamano
2009-10-02 14:54 ` Björn Steinbrink
2009-09-10 14:16 ` Jeff King
2009-09-10 14:26 ` Jeff King
2009-09-10 15:24 ` Johannes Schindelin
2009-09-10 15:25 ` [PATCH v2] Introduce <branch>@{upstream} " Johannes Schindelin
2009-09-10 15:55 ` Jeff King
2009-09-10 16:18 ` Johannes Schindelin
2009-09-10 15:22 ` [PATCH] Introduce <branch>@{tracked} " Johannes Schindelin
2009-09-11 4:54 ` tracking branch for a rebase Junio C Hamano
2009-09-05 17:59 ` 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
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=20090904135414.GA3728@honk.padd.com \
--to=pw@padd.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).