git/list[1] front-page[2] threads[3] people[4] search[5] about
 

More help with "pull" please

From
JDJohn Dlugosz <jdlugosz@tradestation.com>
Date
Apr 1, 2009, 19:28 UTC
Message-ID
<450196A1AAAE4B42A00A8B27A59278E70A7D4D9A@EXCHANGE.trad.tradestation.com>

I've actually given up on using "git pull" at all, preferring to fetch first, examine in gitk, and then decide whether to merge or whatever.

The problem I have is that it seems to always want to merge "something" with the current checked-out branch. It always throws the remote HEAD into the mix, or if fetch lines are set up in the configuration file, takes the first thing on there regardless of which branch I'm currently checked out. Maybe I'm wrong, but I just re-read the man page, forward and backwards, and am more bewildered than ever.

Anyway, I want to help out a co-worker who has a more specialized situation that may be right for a pull. Also, I'll talk him through cloning the remote from the beginning, so the config files won't be all strange or not setup from the previous users.

The only remaining issue is the remote in question: it is not a bare repository, and may be in use locally as well, at least for maintenance. So I can't trust its HEAD to be anything reasonable at any given time.

This person wants to track a remote branch tip. When that advances or otherwise changes on the remote, update the working tree to match. It will always use the same branch, let's call it ReleaseCandidate for this discussion.

My question is: What is the easiest way to create this local repository and operate it so that he can just keep it following that branch on the remote?

Thanks, --John (excuse the footer; it's not my idea)

TradeStation Group, Inc. is a publicly-traded holding company (NASDAQ GS: TRAD) of three operating subsidiaries, TradeStation Securities, Inc. (Member NYSE, FINRA, SIPC and NFA), TradeStation Technologies, Inc., a trading software and subscription company, and TradeStation Europe Limited, a United Kingdom, FSA-authorized introducing brokerage firm. None of these companies provides trading or investment advice, recommendations or endorsements of any kind. The information transmitted is intended only for the person or entity to which it is addressed and may contain confidential and/or privileged material. Any review, retransmission, dissemination or other use of, or taking of any action in reliance upon, this information by persons or entities other than the intended recipient is prohibited.
  If you received this in error, please contact the sender and delete the material from any computer.
Next: Tomas Carnecky
Message 1 of 8 in “More help with "pull" please”
  1. John DlugoszApr 1, 2009
  2. Tomas CarneckyApr 1, 2009
  3. John DlugoszApr 1, 2009
  4. Tomas CarneckyApr 1, 2009
  5. John DlugoszApr 1, 2009
  6. Junio C HamanoApr 2, 2009
  7. John DlugoszApr 2, 2009
  8. Tomas CarneckyApr 2, 2009

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.