diff options
| author |  Johan Herland <johan@herland.net> | 2010-02-13 22:28:31 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-02-13 19:36:15 -0800 |
| commit | ba20f15e0a220705695a1ee19fb28234861b890d (patch) | |
| tree | c83cf491b4c13665b69bfd68eb7138efcce58849 /Documentation/git-merge.txt | |
| parent | builtin-notes: Add "list" subcommand for listing note objects (diff) | |
| download | tgif-ba20f15e0a220705695a1ee19fb28234861b890d.tar.xz | |
builtin-notes: Add --message/--file aliases for -m/-F options
Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge.txt')
0 files changed, 0 insertions, 0 deletions