diff options
| author | Matthieu Moy <Matthieu.Moy@imag.fr> | 2015-07-02 16:07:20 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-07-06 10:36:51 -0700 |
| commit | 8482d042a016aaae1e564f9c34b4d5f6b59794be (patch) | |
| tree | 2e745d4813e97ffd2d25813c0a866a7b21851557 /t/t6038-merge-text-auto.sh | |
| parent | 356e91f2ecc581f3a446bba566ab1756dc57a583 (diff) | |
| download | git-8482d042a016aaae1e564f9c34b4d5f6b59794be.tar.gz git-8482d042a016aaae1e564f9c34b4d5f6b59794be.tar.xz | |
Documentation/branch: document -d --force and -m --force
The --force option was modified in 356e91f (branch: allow -f with -m and
-d, 2014-12-08), but the documentation was not updated.
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6038-merge-text-auto.sh')
0 files changed, 0 insertions, 0 deletions