summaryrefslogtreecommitdiff
path: root/git-merge-one-file.sh
diff options
context:
space:
mode:
authorLibravatar Jay Soffian <jaysoffian@gmail.com>2009-03-06 11:30:44 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-03-07 20:23:09 -0800
commit3c7b480a1cf6e1a1c73b4edde5d8cf0ac0c8111c (patch)
treeb41687400441b03d39efd429dcd7517f815bcfeb /git-merge-one-file.sh
parentbash completion: fix completion issues with fetch, pull, and push (diff)
downloadtgif-3c7b480a1cf6e1a1c73b4edde5d8cf0ac0c8111c.tar.xz
bash completion: refactor --strategy completion
The code to complete --strategy was duplicated between _git_rebase and _git_merge, and is about to gain a third caller (_git_pull). This patch factors it into its own function. Signed-off-by: Jay Soffian <jaysoffian@gmail.com> Acked-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-one-file.sh')
0 files changed, 0 insertions, 0 deletions