summaryrefslogtreecommitdiff
path: root/diff.h
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-11-15 01:53:22 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-11-17 00:20:40 (GMT)
commit80b1e511d74ac2942043f912d850cb6b85b44689 (patch)
tree4c6e40b8d718769aff9a10b701ba897052268261 /diff.h
parent011f4274bbb14e44035586f2ede695d584b8cfd2 (diff)
downloadgit-80b1e511d74ac2942043f912d850cb6b85b44689.zip
git-80b1e511d74ac2942043f912d850cb6b85b44689.tar.gz
git-80b1e511d74ac2942043f912d850cb6b85b44689.tar.bz2
diff: --full-index
A new option, --full-index, is introduced to diff family. This causes the full object name of pre- and post-images to appear on the index line of patch formatted output, to be used in conjunction with --allow-binary-replacement option of git-apply. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'diff.h')
-rw-r--r--diff.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/diff.h b/diff.h
index 1259079..9b2e1e6 100644
--- a/diff.h
+++ b/diff.h
@@ -32,7 +32,8 @@ struct diff_options {
const char *orderfile;
const char *pickaxe;
unsigned recursive:1,
- tree_in_recursive:1;
+ tree_in_recursive:1,
+ full_index:1;
int break_opt;
int detect_rename;
int find_copies_harder;
@@ -96,6 +97,7 @@ extern void diffcore_std_no_resolve(struct diff_options *);
" -u synonym for -p.\n" \
" --name-only show only names of changed files.\n" \
" --name-status show names and status of changed files.\n" \
+" --full-index show full object name on index ines.\n" \
" -R swap input file pairs.\n" \
" -B detect complete rewrites.\n" \
" -M detect renames.\n" \