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

Rebase problems

From
MMaaartin <grajcar1@seznam.cz>
Date
Nov 8, 2010, 18:19 UTC
Message-ID
<loom.20101108T190513-206@post.gmane.org>

I'm using git for a project I'm working on alone (and I really like it), so I could rebase a lot, if I hadn't the following problems.

There's a file containing the timestamp which gets compiled in, so the executable can show it's version. Sometimes, I need to set it couple of times a day, sometimes only once a week. For each such timestamp I create a tag, so I can track it to the source easily. The timestamp is an important piece of information, so I put the containing file under version control. The downside is that I often get a conflict in this file halting my rebase. Is there a way how to ignore or automatically resolve all conflicts in this file (any resolution strategy is fine, as it will be overwritten anyway).

The second problem is problem of cygwin. While most of the operations git run in fractions of seconds, the most trivial rebase may take one minute or alike. Any idea what different things rebase do?

Next: Wincent Colaiuta
Message 1 of 5 in “Rebase problems”
  1. MaaartinNov 8, 2010
  2. Wincent ColaiutaNov 8, 2010
  3. Maaartin-1Nov 8, 2010
  4. MaaartinNov 12, 2010
  5. Andreas SchwabNov 8, 2010

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.