summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-index.txt
diff options
context:
space:
mode:
authorNikolai Weibull <mailing-lists.git@rawuncut.elitemail.org>2005-12-09 00:28:05 +0100
committerJunio C Hamano <junkio@cox.net>2005-12-08 15:50:13 -0800
commit68e37f8402d5ad33b423686558265e55655a2db6 (patch)
tree3afed8e307f349d30ed41c7971aadf228d4cbc9a /Documentation/git-merge-index.txt
parent63ae26f87ae1d3a95a8ecc2fc761b7a7987e3ce5 (diff)
downloadgit-68e37f8402d5ad33b423686558265e55655a2db6.tar.gz
Fix the description of --utf8 and --keep to git-am.
The git-am script actually transform --utf8 and --keep to -u and -k when sent to git-mailinfo. Signed-off-by: Nikolai Weibull <nikolai@bitwi.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-merge-index.txt')
0 files changed, 0 insertions, 0 deletions