summaryrefslogtreecommitdiff
path: root/git-merge-resolve.sh
diff options
context:
space:
mode:
authorLibravatar Oded Shimon <ods15@ods15.dyndns.org>2010-09-09 21:49:51 +0300
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-09-09 17:09:44 -0700
commit5b220a6876f37d6c88d1d7a54ec115efc1e25255 (patch)
tree98683b1f433ccc61ddfd43704fb05babb7c7d846 /git-merge-resolve.sh
parentrevert: Fix trivial comment style issue (diff)
downloadtgif-5b220a6876f37d6c88d1d7a54ec115efc1e25255.tar.xz
Add --src/dst-prefix to git-formt-patch in git-rebase.sh
For the case of "diff.noprefix" in git-config, git-format-patch should still output diff with standard prefixes for git-am Signed-off-by: Oded Shimon <ods15@ods15.dyndns.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions