Skip to content
  • John Keeping's avatar
    add--interactive: respect diff.algorithm · 2cc0f53b
    John Keeping authored and Junio C Hamano's avatar Junio C Hamano committed
    
    
    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).
    
    Since add--interactive is a porcelain command it should respect this
    configuration variable.  To do this, make it read diff.algorithm and
    pass its value to the underlying diff-index and diff-files invocations.
    
    At this point, do not add options to "git add", "git reset" or "git
    checkout" (all of which can call git-add--interactive).  If a user
    wants to override the value on the command line they can use:
    
    	git -c diff.algorithm=$ALGO ...
    
    Signed-off-by: default avatarJohn Keeping <john@keeping.me.uk>
    Reviewed-by: default avatarJeff King <peff@peff.net>
    Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
    2cc0f53b