diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-02-03 11:25:19 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-02-03 11:25:19 -0800 |
| commit | fafca0f72a11bc03263e6f97d07d6f27ea61de48 (patch) | |
| tree | 0498cf6b916a833d71ac540c4eec85212ee6ac94 /Documentation | |
| parent | 74dee5cfae1250693447349f3f6bbc26201c5524 (diff) | |
| parent | 67c70bd930538890d8eccace72fb0e0a0e565447 (diff) | |
| download | git-fafca0f72a11bc03263e6f97d07d6f27ea61de48.tar.xz | |
Merge branch 'cw/log-updates-for-all-refs-really'
The "core.logAllRefUpdates" that used to be boolean has been
enhanced to take 'always' as well, to record ref updates to refs
other than the ones that are expected to be updated (i.e. branches,
remote-tracking branches and notes).
* cw/log-updates-for-all-refs-really:
doc: add note about ignoring '--no-create-reflog'
update-ref: add test cases for bare repository
refs: add option core.logAllRefUpdates = always
config: add markup to core.logAllRefUpdates doc
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config.txt | 8 | ||||
| -rw-r--r-- | Documentation/git-branch.txt | 3 | ||||
| -rw-r--r-- | Documentation/git-tag.txt | 6 |
3 files changed, 13 insertions, 4 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index fc78139c21..fc5a28a320 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -520,10 +520,12 @@ core.logAllRefUpdates:: "`$GIT_DIR/logs/<ref>`", by appending the new and old SHA-1, the date/time and the reason of the update, but only when the file exists. If this configuration - variable is set to true, missing "`$GIT_DIR/logs/<ref>`" + variable is set to `true`, missing "`$GIT_DIR/logs/<ref>`" file is automatically created for branch heads (i.e. under - refs/heads/), remote refs (i.e. under refs/remotes/), - note refs (i.e. under refs/notes/), and the symbolic ref HEAD. + `refs/heads/`), remote refs (i.e. under `refs/remotes/`), + note refs (i.e. under `refs/notes/`), and the symbolic ref `HEAD`. + If it is set to `always`, then a missing reflog is automatically + created for any ref under `refs/`. + This information can be used to determine what commit was the tip of a branch "2 days ago". diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt index 5516a47b54..28d46cc03b 100644 --- a/Documentation/git-branch.txt +++ b/Documentation/git-branch.txt @@ -91,6 +91,9 @@ OPTIONS based sha1 expressions such as "<branchname>@\{yesterday}". Note that in non-bare repositories, reflogs are usually enabled by default by the `core.logallrefupdates` config option. + The negated form `--no-create-reflog` only overrides an earlier + `--create-reflog`, but currently does not negate the setting of + `core.logallrefupdates`. -f:: --force:: diff --git a/Documentation/git-tag.txt b/Documentation/git-tag.txt index 8e70c5b6a4..525737a5d8 100644 --- a/Documentation/git-tag.txt +++ b/Documentation/git-tag.txt @@ -150,7 +150,11 @@ This option is only applicable when listing tags without annotation lines. 'strip' removes both whitespace and commentary. --create-reflog:: - Create a reflog for the tag. + Create a reflog for the tag. To globally enable reflogs for tags, see + `core.logAllRefUpdates` in linkgit:git-config[1]. + The negated form `--no-create-reflog` only overrides an earlier + `--create-reflog`, but currently does not negate the setting of + `core.logallrefupdates`. <tagname>:: The name of the tag to create, delete, or describe. |