diff options
author | Junio C Hamano <junkio@cox.net> | 2006-07-09 00:52:36 -0700 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2006-07-09 00:52:36 -0700 |
commit | 88f0d5d7d95f815d2e8a36a8ceb7459dbd90992c (patch) | |
tree | 926ba840250be0456f868099bf4a498c64c51e2f /diff.h | |
parent | f3aafa4db29c3d4799eeeda21efaf15d364ae59a (diff) | |
parent | d507bb15008d6ee657eebaf2803bf0964af12c93 (diff) | |
download | git-88f0d5d7d95f815d2e8a36a8ceb7459dbd90992c.tar.gz |
Merge branch 'sf/diff'
Diffstat (limited to 'diff.h')
-rw-r--r-- | diff.h | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -42,6 +42,7 @@ struct diff_options { unsigned recursive:1, tree_in_recursive:1, binary:1, + text:1, full_index:1, silent_on_remove:1, find_copies_harder:1, @@ -161,7 +162,8 @@ extern void diffcore_std_no_resolve(struct diff_options *); " -O<file> reorder diffs according to the <file>.\n" \ " -S<string> find filepair whose only one side contains the string.\n" \ " --pickaxe-all\n" \ -" show all files diff when -S is used and hit is found.\n" +" show all files diff when -S is used and hit is found.\n" \ +" -a --text treat all files as text.\n" extern int diff_queue_is_empty(void); extern void diff_flush(struct diff_options*); |