diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-08-07 20:44:49 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-08-07 20:44:49 -0700 |
| commit | 7ecc9b153c89aeec7470256f7b121fd845101b57 (patch) | |
| tree | 0bf662b5dd1ffe642756f5cb168902a89b60506a /Documentation/git-rerere.txt | |
| parent | verify-pack: migrate to parse-options (diff) | |
| parent | Merge branch 'maint-1.6.3' into maint (diff) | |
| download | tgif-7ecc9b153c89aeec7470256f7b121fd845101b57.tar.xz | |
Merge branch 'maint' into jc/verify-pack-stat
* maint: (95 commits)
verify-pack -v: do not report "chain length 0"
t5510: harden the way verify-pack is used
gitweb/README: Document $base_url
Documentation: git submodule: add missing options to synopsis
Better usage string for reflog.
hg-to-git: don't import the unused popen2 module
send-email: remove debug trace
config: Keep inner whitespace verbatim
GIT 1.6.4
GIT 1.6.3.4
config.txt: document add.ignore-errors
request-pull: allow ls-remote to notice remote.$nickname.uploadpack
Update the documentation of the raw diff output format
git-rerere.txt: Clarify ambiguity of the config variable
t9143: do not fail if Compress::Zlib is missing
Trivial path quoting fixes in git-instaweb
GIT 1.6.4-rc3
Documentation/config.txt: a variable can be defined on the section header line
git svn: make minimize URL more reliable over http(s)
Disable asciidoc 8.4.1+ semantics for `{plus}` and friends
...
Diffstat (limited to 'Documentation/git-rerere.txt')
| -rw-r--r-- | Documentation/git-rerere.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-rerere.txt b/Documentation/git-rerere.txt index a53c3cd35b..7dd515b8cc 100644 --- a/Documentation/git-rerere.txt +++ b/Documentation/git-rerere.txt @@ -23,7 +23,7 @@ on the initial manual merge, and applying previously recorded hand resolutions to their corresponding automerge results. [NOTE] -You need to set the configuration variable rerere.enabled to +You need to set the configuration variable rerere.enabled in order to enable this command. |