diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-06-25 11:02:16 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-06-25 11:02:17 -0700 |
| commit | ebf4fc90da239f1005d2c5b1a4278cfe51430151 (patch) | |
| tree | fbbf73c27da9cda04725eb7f5b21432db8622b93 /Documentation/git-merge-one-file.txt | |
| parent | Merge branch 'jk/make-fix-dependencies' into maint (diff) | |
| parent | Documentation: include 'merge.branchdesc' for merge and config as well (diff) | |
| download | tgif-ebf4fc90da239f1005d2c5b1a4278cfe51430151.tar.xz | |
Merge branch 'sg/merge-summary-config' into maint
Doc updates.
* sg/merge-summary-config:
Documentation: include 'merge.branchdesc' for merge and config as well
Diffstat (limited to 'Documentation/git-merge-one-file.txt')
0 files changed, 0 insertions, 0 deletions