diff options
| author | Felipe Contreras <felipe.contreras@gmail.com> | 2013-05-09 01:16:55 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-05-17 19:09:21 (GMT) |
| commit | 0460ed2c93d78c753242f835c441f320f792ac54 (patch) | |
| tree | 7128ca5567b1ed56dba60845ad26b32c40d7a4f5 /Documentation/git-merge.txt | |
| parent | 9b795193a6a7e963db62d9cd8e86752a40940520 (diff) | |
| download | git-0460ed2c93d78c753242f835c441f320f792ac54.zip git-0460ed2c93d78c753242f835c441f320f792ac54.tar.gz git-0460ed2c93d78c753242f835c441f320f792ac54.tar.bz2 | |
documentation: trivial style cleanups
White-spaces, missing braces, standardize --[no-]foo.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge.txt')
| -rw-r--r-- | Documentation/git-merge.txt | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index 42391f2..67ca99c 100644 --- a/Documentation/git-merge.txt +++ b/Documentation/git-merge.txt @@ -76,8 +76,7 @@ The 'git fmt-merge-msg' command can be used to give a good default for automated 'git merge' invocations. ---rerere-autoupdate:: ---no-rerere-autoupdate:: +--[no-]rerere-autoupdate:: Allow the rerere mechanism to update the index with the result of auto-conflict resolution if possible. |