diff options
author | Junio C Hamano <gitster@pobox.com> | 2012-02-27 15:31:50 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2012-02-27 15:31:50 -0800 |
commit | 4eed30a7cb56dfd21917a3685eccb1d8321d852f (patch) | |
tree | fe0f1e322a72cc805d11b93e628ecf0ba8db9d5c /builtin/fmt-merge-msg.c | |
parent | CodingGuidelines: do not use 'which' in shell scripts (diff) | |
parent | merge: add instructions to the commit message when editing (diff) | |
download | tgif-4eed30a7cb56dfd21917a3685eccb1d8321d852f.tar.xz |
Merge branch 'tr/merge-edit-guidance' into maint
* tr/merge-edit-guidance:
merge: add instructions to the commit message when editing
Diffstat (limited to 'builtin/fmt-merge-msg.c')
0 files changed, 0 insertions, 0 deletions