summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2009-09-13 01:33:15 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-09-13 01:33:15 -0700
commit8b54f63dce34c3bbd7ff919fb53c1c253221fe71 (patch)
tree8e540c253e699f1de5276fd96194f9df82f18fe3 /Documentation
parentquiltimport documentation: --dry-run and -n are synonyms (diff)
parentmerge-recursive: give less scary messages when merge did not start (diff)
downloadtgif-8b54f63dce34c3bbd7ff919fb53c1c253221fe71.tar.xz
Merge branch 'jc/merge-saner-messages'
* jc/merge-saner-messages: merge-recursive: give less scary messages when merge did not start
Diffstat (limited to 'Documentation')
0 files changed, 0 insertions, 0 deletions