diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-12-19 19:32:29 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-12-19 19:35:55 -0800 |
| commit | efe05b019ca19328d27c07ef32b4698a7f36166f (patch) | |
| tree | a38d3c5713d39370e881c148ff0f5c9d4db59c67 /Documentation/git-reflog.txt | |
| parent | ec9f0ea3e6ecf1237223dec8428e7bb73d339320 (diff) | |
| parent | 718258e256b74622aa55f5ee0cb9cff4cce6bf9f (diff) | |
| download | git-efe05b019ca19328d27c07ef32b4698a7f36166f.tar.gz | |
Merge branch 'maint' to sync with GIT 1.6.0.6
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-reflog.txt')
| -rw-r--r-- | Documentation/git-reflog.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-reflog.txt b/Documentation/git-reflog.txt index d99236e14d..7f7a5445c7 100644 --- a/Documentation/git-reflog.txt +++ b/Documentation/git-reflog.txt @@ -28,7 +28,7 @@ updated. This command is to manage the information recorded in it. The subcommand "expire" is used to prune older reflog entries. Entries older than `expire` time, or entries older than -`expire-unreachable` time and are not reachable from the current +`expire-unreachable` time and not reachable from the current tip, are removed from the reflog. This is typically not used directly by the end users -- instead, see linkgit:git-gc[1]. @@ -71,7 +71,7 @@ them. which in turn defaults to 90 days. --expire-unreachable=<time>:: - Entries older than this time and are not reachable from + Entries older than this time and not reachable from the current tip of the branch are pruned. Without the option it is taken from configuration `gc.reflogExpireUnreachable`, which in turn defaults to |