aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Fonseca <fonseca@diku.dk>2006-03-06 06:24:44 +0100
committerJunio C Hamano <junkio@cox.net>2006-04-18 12:06:55 -0700
commit8f2b72a93666afe63ab39b279bbd4088bd5463ca (patch)
treef851f4bfb498d2a2c19989a705f8caefb728cfb5
parentf56ef54174598d5362d0446c5a560cb5892537c2 (diff)
downloadgit-8f2b72a93666afe63ab39b279bbd4088bd5463ca.tar.gz
git-8f2b72a93666afe63ab39b279bbd4088bd5463ca.tar.xz
Add git-annotate(1) and git-blame(1)
[jc: with entries in git.txt] Signed-off-by: Jonas Fonseca <fonseca@diku.dk> Signed-off-by: Junio C Hamano <junkio@cox.net>
-rw-r--r--Documentation/git-annotate.txt44
-rw-r--r--Documentation/git-blame.txt42
-rw-r--r--Documentation/git.txt6
-rw-r--r--Makefile1
4 files changed, 92 insertions, 1 deletions
diff --git a/Documentation/git-annotate.txt b/Documentation/git-annotate.txt
new file mode 100644
index 000000000..7baf73111
--- /dev/null
+++ b/Documentation/git-annotate.txt
@@ -0,0 +1,44 @@
+git-annotate(1)
+===============
+
+NAME
+----
+git-annotate - Annotate file lines with commit info
+
+SYNOPSIS
+--------
+git-annotate [options] file [revision]
+
+DESCRIPTION
+-----------
+Annotates each line in the given file with information from the commit
+which introduced the line. Optionally annotate from a given revision.
+
+OPTIONS
+-------
+-l, --long::
+ Show long rev (Defaults off).
+
+-t, --time::
+ Show raw timestamp (Defaults off).
+
+-r, --rename::
+ Follow renames (Defaults on).
+
+-S, --rev-file <revs-file>::
+ Use revs from revs-file instead of calling git-rev-list.
+
+-h, --help::
+ Show help message.
+
+SEE ALSO
+--------
+gitlink:git-blame[1]
+
+AUTHOR
+------
+Written by Ryan Anderson <ryan@michonline.com>.
+
+GIT
+---
+Part of the gitlink:git[7] suite
diff --git a/Documentation/git-blame.txt b/Documentation/git-blame.txt
new file mode 100644
index 000000000..51898787e
--- /dev/null
+++ b/Documentation/git-blame.txt
@@ -0,0 +1,42 @@
+git-blame(1)
+============
+
+NAME
+----
+git-blame - Blame file lines on commits
+
+SYNOPSIS
+--------
+git-blame file [options] file [revision]
+
+DESCRIPTION
+-----------
+Annotates each line in the given file with information from the commit
+which introduced the line. Start annotation from the given revision.
+
+OPTIONS
+-------
+-c, --compability::
+ Use the same output mode as git-annotate (Default: off).
+
+-l, --long::
+ Show long rev (Defaults off).
+
+-S, --rev-file <revs-file>::
+ Use revs from revs-file instead of calling git-rev-list.
+
+-h, --help::
+ Show help message.
+
+
+SEE ALSO
+--------
+gitlink:git-annotate[1]
+
+AUTHOR
+------
+Written by Fredrik Kuivinen <freku045@student.liu.se>.
+
+GIT
+---
+Part of the gitlink:git[7] suite
diff --git a/Documentation/git.txt b/Documentation/git.txt
index 03d860b19..24ca55da6 100644
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -399,6 +399,12 @@ gitlink:git-update-ref[1]::
Interrogators:
+gitlink:git-annotate[1]::
+ Annotate file lines with commit info.
+
+gitlink:git-blame[1]::
+ Blame file lines on commits.
+
gitlink:git-check-ref-format[1]::
Make sure ref name is well formed.
diff --git a/Makefile b/Makefile
index 8371f7f52..8aed3af01 100644
--- a/Makefile
+++ b/Makefile
@@ -671,7 +671,6 @@ check-docs::
@for v in $(ALL_PROGRAMS) $(BUILT_INS) git$X gitk; \
do \
case "$$v" in \
- git-annotate | git-blame | \
git-merge-octopus | git-merge-ours | git-merge-recursive | \
git-merge-resolve | git-merge-stupid | \
git-ssh-pull | git-ssh-push ) continue ;; \