summaryrefslogtreecommitdiff
path: root/test-mergesort.c
diff options
context:
space:
mode:
authorJohn Keeping <john@keeping.me.uk>2013-06-12 19:44:10 +0100
committerJunio C Hamano <gitster@pobox.com>2013-06-12 13:41:19 -0700
commit2cc0f53b53e7d5456ec45713a201142754d69249 (patch)
tree94418ab8fab56d71df612e36144bfb54a472033f /test-mergesort.c
parentedca4152560522a431a51fc0a06147fc680b5b18 (diff)
downloadgit-2cc0f53b53e7d5456ec45713a201142754d69249.tar.gz
add--interactive: respect diff.algorithm
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: John Keeping <john@keeping.me.uk> Reviewed-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'test-mergesort.c')
0 files changed, 0 insertions, 0 deletions