diff options
| author |  Junio C Hamano <junkio@cox.net> | 2007-04-16 02:54:18 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-04-16 02:54:18 -0700 |
| commit | 402fa75eed29c104ae5392ce88560f6bffc64ce7 (patch) | |
| tree | 3a11126c271f412b35b8a0409ce104bce678fae1 /builtin-blame.c | |
| parent | git-rm: Trivial fix for a comment typo. (diff) | |
| parent | Have sample update hook not refuse deleting a branch through push. (diff) | |
| download | tgif-402fa75eed29c104ae5392ce88560f6bffc64ce7.tar.xz | |
Merge branch 'maint'
* maint:
Have sample update hook not refuse deleting a branch through push.
variable $projectdesc needs to be set before checking against unchanged default.
Update git-annotate/git-blame documentation
Update git-apply documentation
Update git-applymbox documentation
Update git-am documentation
user-manual: use detached head when rewriting history
user-manual: start revising "internals" chapter
user-manual: detached HEAD
user-manual: fix discussion of default clone
Documentation: clarify track/no-track option.
Documentation: clarify git-checkout -f, minor editing
Documentation: minor edits of git-lost-found manpage
Diffstat (limited to 'builtin-blame.c')
| -rw-r--r-- | builtin-blame.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/builtin-blame.c b/builtin-blame.c index bc86bda6c4..8919b028e6 100644 --- a/builtin-blame.c +++ b/builtin-blame.c @@ -19,11 +19,11 @@ static char blame_usage[] = "git-blame [-c] [-l] [-t] [-f] [-n] [-p] [-L n,m] [-S <revs-file>] [-M] [-C] [-C] [--contents <filename>] [--incremental] [commit] [--] file\n" -" -c, --compatibility Use the same output mode as git-annotate (Default: off)\n" +" -c Use the same output mode as git-annotate (Default: off)\n" " -b Show blank SHA-1 for boundary commits (Default: off)\n" -" -l, --long Show long commit SHA1 (Default: off)\n" +" -l Show long commit SHA1 (Default: off)\n" " --root Do not treat root commits as boundaries (Default: off)\n" -" -t, --time Show raw timestamp (Default: off)\n" +" -t Show raw timestamp (Default: off)\n" " -f, --show-name Show original filename (Default: auto)\n" " -n, --show-number Show original linenumber (Default: off)\n" " -p, --porcelain Show in a format designed for machine consumption\n" |