summaryrefslogtreecommitdiff
path: root/git-merge-recursive.py
diff options
context:
space:
mode:
authorLibravatar Mark Wooding <mdw@distorted.org.uk>2006-02-27 12:52:50 +0000
committerLibravatar Junio C Hamano <junkio@cox.net>2006-02-27 11:01:05 -0800
commite70c6b35749c316f6e97099bd6bdac895c9d6f68 (patch)
tree50647be453ca1a61006156ad724c470bd506d5fa /git-merge-recursive.py
parentsvnimport: Convert the svn:ignore property (diff)
downloadtgif-e70c6b35749c316f6e97099bd6bdac895c9d6f68.tar.xz
combine-diff: Honour --full-index.
For some reason, combined diffs don't honour the --full-index flag when emitting patches. Fix this. Signed-off-by: Mark Wooding <mdw@distorted.org.uk> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-merge-recursive.py')
0 files changed, 0 insertions, 0 deletions