public inbox for git@vger.kernel.org 
 help / color / mirror / Atom feed

From: Tilman Vogel <tilman.vogel@web•de>
To: git@vger•kernel.org
Subject: RFC: script to manually associate files after failed rename detection in conflicting merge
Date: Wed, 30 Mar 2011 15:38:37 +0200	[thread overview]
Message-ID: <4D93325D.70403@web.de> (raw)

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hi!

I am aware of the fact that recently, git gained the ability to control
the rename-threshold in merges. Still, it might sometimes be useful to
have manual control about what gets associated as a rename.

This is a first try to write a script that makes this task easy. I
tested it here on CONFLICT (delete/modify) results and it seems to work
quite well.

I would be interested in feedback, in particular whether something
similar is present already, even though I couldn't find anything other
than the instructions in the FAQ.

I put the script on gist.github.com at

<https://gist.github.com/894374>

Another, a little related question: Is anybody already working on making
"git checkout -m" allow "-X" options? I'd really he happy about "-X
ignore-space-change" and its relatives.

Thanks for any feedback,

Tilman

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.15 (GNU/Linux)
Comment: Using GnuPG with SUSE - http://enigmail.mozdev.org/

iEYEARECAAYFAk2TMl0ACgkQ9ZPu6Yae8lkbiQCgkZ6KkzYqPER6sjKgd+JmZU4P
9joAnjWflRjgqJ24RX+8AjcRU2uKBmGK
=7GfJ
-----END PGP SIGNATURE-----

                 reply	other threads:[~2011-03-30 13:38 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=4D93325D.70403@web.de \
    --to=tilman.vogel@web$(echo .)de \
    --cc=git@vger$(echo .)kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox