From: Andreas Schwab <schwab@linux-m68k.org>
To: Maaartin <grajcar1@seznam.cz>
Cc: git@vger.kernel.org
Subject: Re: Rebase problems
Date: Mon, 08 Nov 2010 20:30:36 +0100 [thread overview]
Message-ID: <m2vd47iper.fsf@igel.home> (raw)
In-Reply-To: <loom.20101108T190513-206@post.gmane.org> (Maaartin's message of "Mon, 8 Nov 2010 18:19:09 +0000 (UTC)")
Maaartin <grajcar1@seznam.cz> writes:
> 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).
If you already have a tag for every timestamp, why not autogenerate the
timestamp from the tag?
Andreas.
--
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5
"And now for something completely different."
next prev parent reply other threads:[~2010-11-08 19:30 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-11-08 18:19 Rebase problems Maaartin
2010-11-08 18:33 ` Wincent Colaiuta
2010-11-08 19:59 ` Maaartin-1
2010-11-12 0:07 ` Maaartin
2010-11-08 19:30 ` Andreas Schwab [this message]
-- strict thread matches above, loose matches on Subject: below --
2005-11-28 14:58 rebase problems Sven Verdoolaege
2005-11-28 20:19 ` Junio C Hamano
2005-11-28 20:24 ` Sven Verdoolaege
2005-11-28 21:02 ` 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=m2vd47iper.fsf@igel.home \
--to=schwab@linux-m68k.org \
--cc=git@vger.kernel.org \
--cc=grajcar1@seznam.cz \
/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.
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 NNTP newsgroup(s).