Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Add -a and --text to common diff options help
author
Stephan Feder
<sf@b-i-t.de>
Fri, 7 Jul 2006 13:57:08 +0000
(15:57 +0200)
committer
Junio C Hamano
<junkio@cox.net>
Fri, 7 Jul 2006 19:28:04 +0000
(12:28 -0700)
Signed-off-by: Stephan Feder <sf@b-i-t.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
diff.h
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
63ac450
)
diff --git
a/diff.h
b/diff.h
index f80f64608ace15a212f22f40cc44192376f7b8da..8ab0448a12e163b0941c05aba4f0a4d9c7a6cfb7 100644
(file)
--- a/
diff.h
+++ b/
diff.h
@@
-162,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" \
" -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*);
extern int diff_queue_is_empty(void);
extern void diff_flush(struct diff_options*);