diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-10-10 12:04:48 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-10-11 15:04:38 +0900 |
| commit | a92b1095d190ea348d365baeb9ff5c5023d0efd2 (patch) | |
| tree | fec3e0fe65eb98e23326f4318e33f6952253991b /Documentation/git-merge-file.txt | |
| parent | describe: do not use cmd_*() as a subroutine (diff) | |
| download | tgif-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/git-merge-file.txt')
0 files changed, 0 insertions, 0 deletions