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

Re: Locally manage user/branch setting files without pushing them remotely

From
Yann Simon <yann.simon.fr@gmail.com>
Date
Nov 11, 2009, 13:06 UTC
Message-ID
<551f769b0911110506x165f6b5arcf45ec920176fcdc@mail.gmail.com>
In-Reply-To
<9accb4400911110500y37437dc5h16388b07a734dc6d@mail.gmail.com>
2009/11/11 Daniele Segato <daniele.bilug@gmail.com>:
Show 16 quoted lines
> On Wed, Nov 11, 2009 at 1:14 PM, Yann Simon <yann.simon.fr@gmail.com> wrote:
>> I am in the same situation.
>> What I did is not to add these files to .gitignore.
>> On my "work" branch, I commited these files in a separate commit
>> "local changes".
>> When I want to push to svn, I switch to the branch "master", and
>> cherry-pick the commit I want to push.
>> $ git checkout master
>> $ git svn rebase
>> $ git cherry-pick work
>> $ git svn dcommit
>> $ git checkout work
>> $ git rebase master
>>
> hum
> but I don't want to push those files

I explained myself not well. In my "work" branch, there is "local changes", with the local configuration files and then "commit xyz to push" That's why I make a git cherry-pick work to get the last commit, the one to push.

Yann
Previous: Daniele SegatoNext: Paolo Ciarrocchi
Message 4 of 10 in “Locally manage user/branch setting files without pushing them remotely”
  1. Daniele SegatoNov 11, 2009
  2. Yann SimonNov 11, 2009
  3. Daniele SegatoNov 11, 2009
  4. Yann SimonNov 11, 2009
  5. Paolo CiarrocchiNov 11, 2009
  6. Nicolas SebrechtNov 11, 2009
  7. Daniele SegatoNov 12, 2009
  8. Nicolas SebrechtNov 12, 2009
  9. Daniele SegatoNov 12, 2009
  10. Nicolas SebrechtNov 12, 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.