diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-04-25 18:34:22 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-04-29 13:24:40 -0700 |
| commit | 1cf32f4d54d7db0da9b2fb35cdd277f9ab7ae0af (patch) | |
| tree | 1196f256f830378ed4e1fdd5c7d6414a5a2f80b8 /Documentation/git-merge-one-file.txt | |
| parent | merge: extract prepare_merge_message() logic out (diff) | |
| download | tgif-1cf32f4d54d7db0da9b2fb35cdd277f9ab7ae0af.tar.xz | |
merge: make collect_parents() auto-generate the merge message
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge-one-file.txt')
0 files changed, 0 insertions, 0 deletions