summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-10-10 12:04:48 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-10-11 15:04:38 +0900
commita92b1095d190ea348d365baeb9ff5c5023d0efd2 (patch)
treefec3e0fe65eb98e23326f4318e33f6952253991b /Documentation
parentdescribe: do not use cmd_*() as a subroutine (diff)
downloadtgif-a92b1095d190ea348d365baeb9ff5c5023d0efd2.tar.xz
merge-ours: do not use cmd_*() as a subroutine
The call to cmd_diff_index() "git merge-ours" makes has been working by accident that the function did not call exit(3), and the caller exited almost immediately after making a call, but it sets a bad precedent for people to cut and paste. For finding out if the index exactly matches the HEAD (or a given tree-ish), there is index_differs_from() which is exactly written for that purpose. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
0 files changed, 0 insertions, 0 deletions