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

Re: Multiple shared repositories (including svn) workflow

From
Jakub Narebski <jnareb@gmail.com>
Date
Jan 5, 2008, 15:07 UTC
Message-ID
<m363y8nwf9.fsf@roke.D-201>
In-Reply-To
<DA45FDDC-BEEB-47F6-A2B6-4FE4FFEF8B0D@vicaya.com>
Luke Lu <git@vicaya.com> writes:
Show 13 quoted lines
> Anyway, I've been using git for only a few months. There might/must
> be better ways to do it. As a user coming from cvs and svn, it seems
> to me that the most confusing command is actually "git pull" as it
> doesn't work with such workflow at all (conflicts with confusing
> messages, until you really understand the implications of rebase). It
> seems to me that if we create a new "git update" command which is
> essentially "git fetch && git rebase <remotebranch>", it would
> greatly alleviate such confusions. Some lessons learned from the
> short experience:
> 
> 1. commit first, ask question later.
> 2. rebase is the new update
> 3. reset --hard and reflog are your friends.

I don't remember if it would be in coming 1.5.4 release, but there is "git pull --rebase", which means fetch + rebase instead of default fetch + merge.

HTH
-- 
Jakub Narebski
Poland
ShadeHawk on #git
Previous: Luke Lu
Message 2 of 2 in “Multiple shared repositories (including svn) workflow”
  1. Luke LuJan 5, 2008
  2. Jakub NarebskiJan 5, 2008

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.