summaryrefslogtreecommitdiff
path: root/contrib/examples/git-merge-ours.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-06-24 12:21:51 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-06-24 12:21:51 -0700
commit54a17cdb9c56cec06f48c8e24b58da795fef301f (patch)
tree55e8e9b22ba182bf5b63e12aaf4a6784f6d537ff /contrib/examples/git-merge-ours.sh
parentMerge branch 'pt/am-abort-fix' (diff)
parentcompletion: teach 'scissors' mode to 'git commit --cleanup=' (diff)
downloadtgif-54a17cdb9c56cec06f48c8e24b58da795fef301f.tar.xz
Merge branch 'sg/completion-commit-cleanup'
* sg/completion-commit-cleanup: completion: teach 'scissors' mode to 'git commit --cleanup='
Diffstat (limited to 'contrib/examples/git-merge-ours.sh')
0 files changed, 0 insertions, 0 deletions