diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-11-15 16:41:02 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-11-15 16:41:02 -0800 |
| commit | 4d8c3258880548510b1d23f0db517adb7dfd2486 (patch) | |
| tree | eeb42aefe5555624063221d7ddc28a29f598ce7f /Documentation/config.txt | |
| parent | Merge branch 'sc/difftool-p4merge' (diff) | |
| parent | Use 'fast-forward' all over the place (diff) | |
| download | tgif-4d8c3258880548510b1d23f0db517adb7dfd2486.tar.xz | |
Merge branch 'fc/doc-fast-forward'
* fc/doc-fast-forward:
Use 'fast-forward' all over the place
Conflicts:
builtin-merge.c
Diffstat (limited to 'Documentation/config.txt')
| -rw-r--r-- | Documentation/config.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index d1e2120e15..cb73d7571f 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1360,7 +1360,7 @@ receive.denyCurrentBranch:: receive.denyNonFastForwards:: If set to true, git-receive-pack will deny a ref update which is - not a fast forward. Use this to prevent such an update via a push, + not a fast-forward. Use this to prevent such an update via a push, even if that push is forced. This configuration variable is set when initializing a shared repository. |