John Keeping j...@keeping.me.uk writes:
+my $diff_algorithm = ($repo-config('diff.algorithm') or 'default');
+
my $use_readkey = 0;
my $use_termcap = 0;
my %term_escapes;
@@ -731,6 +733,9 @@ sub run_git_apply {
sub parse_diff {
my ($path) = @_;
my @diff_cmd = split( ,
On Sun, Jun 23, 2013 at 12:19:05PM -0700, Junio C Hamano wrote:
John Keeping j...@keeping.me.uk writes:
+my $diff_algorithm = ($repo-config('diff.algorithm') or 'default');
+
my $use_readkey = 0;
my $use_termcap = 0;
my %term_escapes;
@@ -731,6 +733,9 @@ sub run_git_apply {
John Keeping j...@keeping.me.uk writes:
The patch below involves deeper Perl magic than I fully grok, but
wouldn't it be simpler to simply use the fact that the string is
command --options... and use:
splice @diff_cmd 1, 0, --diff-algorithm=${diff_algorithm};
That inserts the extra
When staging hunks interactively it is sometimes useful to use an
alternative diff algorithm which splits the changes into hunks in a more
logical manner. This is not possible because the plumbing commands
called by add--interactive ignore the diff.algorithm configuration
option (as they should).
On Wed, Jun 12, 2013 at 07:44:10PM +0100, John Keeping wrote:
When staging hunks interactively it is sometimes useful to use an
alternative diff algorithm which splits the changes into hunks in a more
logical manner. This is not possible because the plumbing commands
called by
5 matches
Mail list logo
