summaryrefslogtreecommitdiff
path: root/Documentation/git-mergetool--lib.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2014-07-23 11:35:45 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-07-23 11:35:45 -0700
commitc3d2bc720cd56af5a18eec219890dcff701680f8 (patch)
tree47abe35663b14edb6a1b0725d8e70a63959e1087 /Documentation/git-mergetool--lib.txt
parentSync with maint (diff)
parenttag: support configuring --sort via .gitconfig (diff)
downloadtgif-c3d2bc720cd56af5a18eec219890dcff701680f8.tar.xz
Merge branch 'jk/tag-sort'
* jk/tag-sort: tag: support configuring --sort via .gitconfig tag: fix --sort tests to use cat<<-\EOF format
Diffstat (limited to 'Documentation/git-mergetool--lib.txt')
0 files changed, 0 insertions, 0 deletions