diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-08-12 18:34:36 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-08-12 18:35:14 -0700 |
| commit | eed94a570e0421175d6b4342c0ac48e03ceedf0b (patch) | |
| tree | f33864f2abffdcb83cbf626b26da34f9cc8d5bab /blame.c | |
| parent | 4147d801db66df9b127ffe315601f467aa9d1c48 (diff) | |
| parent | 01aaf1f88ddc2b99162c302710339f202996f39b (diff) | |
| download | git-eed94a570e0421175d6b4342c0ac48e03ceedf0b.tar.gz | |
Merge branch 'master' into js/c-merge-recursive
Adjust to hold_lock_file_for_update() change on the master.
Diffstat (limited to 'blame.c')
| -rw-r--r-- | blame.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -20,7 +20,7 @@ #define DEBUG 0 -static const char blame_usage[] = "[-c] [-l] [-t] [-S <revs-file>] [--] file [commit]\n" +static const char blame_usage[] = "git-blame [-c] [-l] [-t] [-S <revs-file>] [--] file [commit]\n" " -c, --compatibility Use the same output mode as git-annotate (Default: off)\n" " -l, --long Show long commit SHA1 (Default: off)\n" " -t, --time Show raw timestamp (Default: off)\n" |