summaryrefslogtreecommitdiff
path: root/git-merge-ours.sh
diff options
context:
space:
mode:
authorWincent Colaiuta <win@wincent.com>2007-11-21 12:36:38 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-11-22 08:51:56 (GMT)
commita7d9da6c972cb7bc79ef47ad7199dfb2a8dcf67f (patch)
tree80a41b3b6640deb21e1e218702d00ae9ff19c399 /git-merge-ours.sh
parent5f5b611805ed60a303ccbc07ebd9a5bac2dabb92 (diff)
downloadgit-a7d9da6c972cb7bc79ef47ad7199dfb2a8dcf67f.zip
git-a7d9da6c972cb7bc79ef47ad7199dfb2a8dcf67f.tar.gz
git-a7d9da6c972cb7bc79ef47ad7199dfb2a8dcf67f.tar.bz2
Refactor patch_update_cmd
Split patch_update_cmd into two functions, one to prompt the user for a path to patch and another to do the actual work given that file path. This lays the groundwork for a future commit which will teach git-add--interactive to accept a path parameter and jump directly to the patch subcommand for that path, bypassing the interactive prompt. Signed-off-by: Wincent Colaiuta <win@wincent.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-ours.sh')
0 files changed, 0 insertions, 0 deletions