summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-one-file.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-08-28 21:19:25 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-08-28 21:19:25 -0700
commit67c116bb26b4ee31889e5ee15d6a9d3b7e972b7b (patch)
tree43530142d45ca4e9489abcb76862b2c523c19f4c /Documentation/git-merge-one-file.txt
parentMerge branch 'jc/maint-clone-alternates' (diff)
parentsupport pager.* for external commands (diff)
downloadtgif-67c116bb26b4ee31889e5ee15d6a9d3b7e972b7b.tar.xz
Merge branch 'jk/pager-with-external-command'
* jk/pager-with-external-command: support pager.* for external commands
Diffstat (limited to 'Documentation/git-merge-one-file.txt')
0 files changed, 0 insertions, 0 deletions