diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-03-28 14:38:17 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-03-28 14:38:17 -0700 |
| commit | f1c8d8338f54c5aec18f4d0efa37cec30aafe12a (patch) | |
| tree | 3e5186091020934412d318b906d4f3eeafcfc75f /builtin/commit.c | |
| parent | Merge branch 'jc/remove-treesame-parent-in-simplify-merges' (diff) | |
| parent | Documentation: merging a tag is a special case (diff) | |
| download | git-f1c8d8338f54c5aec18f4d0efa37cec30aafe12a.tar.gz git-f1c8d8338f54c5aec18f4d0efa37cec30aafe12a.zip | |
Merge branch 'yd/doc-merge-annotated-tag'
Document the 1.7.9 feature to merge a signed tag and keep that in
the mergetag header in the resulting commit better.
* yd/doc-merge-annotated-tag:
Documentation: merging a tag is a special case
Diffstat (limited to 'builtin/commit.c')
0 files changed, 0 insertions, 0 deletions