diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-02-22 14:27:07 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-02-22 15:56:27 -0800 |
| commit | 690b29758289ac81062159c178b6d917f06e9862 (patch) | |
| tree | 7d91c734db18d8fdb48c6f9dd7aa514c7302d615 /check-racy.c | |
| parent | Sync with 1.7.6.6 (diff) | |
| download | tgif-690b29758289ac81062159c178b6d917f06e9862.tar.xz | |
Documentation/merge-options.txt: group "ff" related options together
The --ff-only option was not described next to --ff and --no-ff options in
"git merge" documentation, even though these three are logically together,
describing how to choose one of three possibilities.
Also the description for '--ff' and '--no-ff' discussed what '--ff' means,
and mentioned '--no-ff' as if it were a side-note to '--ff'.
Make them into three top-level entries and list them together. This way,
it would be more clear that the user can choose one from these three.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'check-racy.c')
0 files changed, 0 insertions, 0 deletions