summaryrefslogtreecommitdiff
path: root/Documentation/git-merge.txt
diff options
context:
space:
mode:
authorJohan Herland <johan@herland.net>2010-02-13 22:28:31 +0100
committerJunio C Hamano <gitster@pobox.com>2010-02-13 19:36:15 -0800
commitba20f15e0a220705695a1ee19fb28234861b890d (patch)
treec83cf491b4c13665b69bfd68eb7138efcce58849 /Documentation/git-merge.txt
parente397421abf1003c4da824441f91d8c990b70fa98 (diff)
downloadgit-ba20f15e0a220705695a1ee19fb28234861b890d.tar.gz
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