aboutsummaryrefslogtreecommitdiff
path: root/gitMergeCommon.py
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-11-14 17:53:22 -0800
committerJunio C Hamano <junkio@cox.net>2005-11-16 16:20:40 -0800
commit80b1e511d74ac2942043f912d850cb6b85b44689 (patch)
tree4c6e40b8d718769aff9a10b701ba897052268261 /gitMergeCommon.py
parent011f4274bbb14e44035586f2ede695d584b8cfd2 (diff)
downloadgit-80b1e511d74ac2942043f912d850cb6b85b44689.tar.gz
git-80b1e511d74ac2942043f912d850cb6b85b44689.tar.xz
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 'gitMergeCommon.py')
0 files changed, 0 insertions, 0 deletions