diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-02-04 16:54:47 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-02-04 16:54:47 -0800 |
| commit | d1f289c5aa52bb77dc4959fb21cef032d954869f (patch) | |
| tree | 525c95c67c6ae06278a99f244dc5d120c45a8747 /Documentation | |
| parent | 6e2e1cfb81a6a6de9fc074bd26bed8a45f73251f (diff) | |
| parent | 632ac9fd12a2d4ff2c1a1fcd63492ce24315221f (diff) | |
| download | git-d1f289c5aa52bb77dc4959fb21cef032d954869f.tar.gz git-d1f289c5aa52bb77dc4959fb21cef032d954869f.tar.xz | |
Merge branch 'np/dreflog'
* np/dreflog:
show-branch -g: default to the current branch.
Let git-checkout always drop any detached head
Enable HEAD@{...} and make it independent from the current branch
scan reflogs independently from refs
add reflog when moving HEAD to a new branch
create_symref(): do not assume pathname from git_path() persists long enough
add logref support to git-symbolic-ref
move create_symref() past log_ref_write()
add reflog entries for HEAD when detached
enable separate reflog for HEAD
lock_ref_sha1_basic(): remember the original name of a ref when resolving it
make reflog filename independent from struct ref_lock
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-show-branch.txt | 8 | ||||
| -rw-r--r-- | Documentation/git-symbolic-ref.txt | 6 |
2 files changed, 10 insertions, 4 deletions
diff --git a/Documentation/git-show-branch.txt b/Documentation/git-show-branch.txt index b38633c39..ba5313d51 100644 --- a/Documentation/git-show-branch.txt +++ b/Documentation/git-show-branch.txt @@ -11,7 +11,7 @@ SYNOPSIS 'git-show-branch' [--all] [--remotes] [--topo-order] [--current] [--more=<n> | --list | --independent | --merge-base] [--no-name | --sha1-name] [--topics] [<rev> | <glob>]... -'git-show-branch' (-g|--reflog)[=<n>[,<base>]] [--list] <ref> +'git-show-branch' (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>] DESCRIPTION ----------- @@ -97,11 +97,13 @@ OPTIONS will show the revisions given by "git rev-list {caret}master topic1 topic2" ---reflog[=<n>[,<base>]] <ref>:: +--reflog[=<n>[,<base>]] [<ref>]:: Shows <n> most recent ref-log entries for the given ref. If <base> is given, <n> entries going back from that entry. <base> can be specified as count or date. - `-g` can be used as a short-hand for this option. + `-g` can be used as a short-hand for this option. When + no explicit <ref> parameter is given, it defaults to the + current branch (or `HEAD` if it is detached). Note that --more, --list, --independent and --merge-base options are mutually exclusive. diff --git a/Documentation/git-symbolic-ref.txt b/Documentation/git-symbolic-ref.txt index f93b79a85..a88f72286 100644 --- a/Documentation/git-symbolic-ref.txt +++ b/Documentation/git-symbolic-ref.txt @@ -7,7 +7,7 @@ git-symbolic-ref - Read and modify symbolic refs SYNOPSIS -------- -'git-symbolic-ref' [-q] <name> [<ref>] +'git-symbolic-ref' [-q] [-m <reason>] <name> [<ref>] DESCRIPTION ----------- @@ -31,6 +31,10 @@ OPTIONS symbolic ref but a detached HEAD; instead exit with non-zero status silently. +-m:: + Update the reflog for <name> with <reason>. This is valid only + when creating or updating a symbolic ref. + NOTES ----- In the past, `.git/HEAD` was a symbolic link pointing at |