summaryrefslogtreecommitdiff
path: root/diff.h
diff options
context:
space:
mode:
authorLibravatar Pratik Karki <predatoramigo@gmail.com>2018-08-08 21:21:35 +0545
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-10-11 14:16:05 +0900
commitb361bd754d141ef1010286dbe5fe810992a498a0 (patch)
treede51260d3fc5a6100fd784dc008ff26c4a1ffe2b /diff.h
parentbuiltin rebase: use no-op editor when interactive is "implied" (diff)
downloadtgif-b361bd754d141ef1010286dbe5fe810992a498a0.tar.xz
builtin rebase: error out on incompatible option/mode combinations
While working on the GSoC project to convert the rebase command to a builtin, the rebase command learned to error out on certain command-line option combinations that cannot work, such as --whitespace=fix with --interactive. This commit converts that code. Signed-off-by: Pratik Karki <predatoramigo@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diff.h')
0 files changed, 0 insertions, 0 deletions