Merge branch 'integration'

.gitignore

@@ -0,0 +1 @@
+

Makefile

@@ -1,18 +1,50 @@
 
 PREFIX ?= /usr/local
+MANPATH ?= "$(PREFIX)/share/man/man1"
 BINS = $(wildcard bin/git-*)
+MANS = $(wildcard man/git-*.md)
+MAN_HTML = $(MANS:.md=.html)
+MAN_PAGES = $(MANS:.md=.1)
 
 install:
-	@echo "... installing to $(PREFIX)/bin"
+	@mkdir -p $(MANPATH)
+	@echo "... installing bins to $(PREFIX)/bin"
+	@echo "... installing man pages to $(MANPATH)"
 	@$(foreach BIN, $(BINS), \
 		echo "... installing `basename $(BIN)`"; \
 		cp -f $(BIN) $(PREFIX)/$(BIN); \
 	)
+	cp -f man/git-*.1 $(MANPATH)
+
+docs: $(MAN_HTML) $(MAN_PAGES)
+
+man/%.html: man/%.md
+	ronn \
+		--manual "Git Extras" \
+		--html \
+		--pipe \
+		$< > $@
+
+man/%.1: man/%.md
+	ronn -r \
+		--manual "Git Extras" \
+		--pipe \
+		$< > $@
 
 uninstall:
 	@$(foreach BIN, $(BINS), \
 		echo "... uninstalling $(PREFIX)/$(BIN)"; \
 		rm -f $(PREFIX)/$(BIN); \
 	)
+	@$(foreach MAN, $(MAN_PAGES), \
+		echo "... uninstalling $(MANPATH)/$(MAN)"; \
+		rm -f $(MANPATH)/$(MAN); \
+	)
+
+clean: docclean
+
+docclean:
+	rm -f man/*.1
+	rm -f man/*.html
 
-.PHONY: install uninstall
+.PHONY: docs clean docclean install uninstall

man/git-changelog.1

@@ -0,0 +1,77 @@
+.\" generated with Ronn/v0.7.3
+.\" http://github.com/rtomayko/ronn/tree/0.7.3
+.
+.TH "GIT\-CHANGELOG" "1" "October 2010" "" "Git Extras"
+.
+.SH "NAME"
+\fBgit\-changelog\fR \- Generate the changelog report
+.
+.SH "SYNOPSIS"
+\fBgit\-changelog\fR [\-\-list]
+.
+.SH "DESCRIPTION"
+Populates the file named matching \fIchange|history \-i\fR with the commits since the previous tag or since the project began when no tags are present\. Opens the changelog in \fB$EDITOR\fR when set\.
+.
+.SH "OPTIONS"
+\-\-list
+.
+.P
+Show commit logs from the current version\.
+.
+.SH "EXAMPLES"
+.
+.IP "\(bu" 4
+Updating changelog file:
+.
+.IP
+$ git changelog
+.
+.IP "\(bu" 4
+Listing commits from the current version:
+.
+.IP
+$ git changelog \-\-list
+.
+.IP "\(bu" 4
+Docs for git\-ignore\. Closes #3
+.
+.IP "\(bu" 4
+Merge branch \'ignore\'
+.
+.IP "\(bu" 4
+Added git\-ignore
+.
+.IP "\(bu" 4
+Fixed <tag> in docs
+.
+.IP "\(bu" 4
+Install docs
+.
+.IP "\(bu" 4
+Merge branch \'release\'
+.
+.IP "\(bu" 4
+Added git\-release
+.
+.IP "\(bu" 4
+Passing args to git shortlog
+.
+.IP "\(bu" 4
+Added \-\-all support to git\-count
+.
+.IP "\(bu" 4
+Initial commit
+.
+.IP "" 0
+
+.
+.IP "" 0
+.
+.SH "AUTHOR"
+Written by Tj Holowaychuk <\fItj@vision\-media\.ca\fR>
+.
+.SH "REPORTING BUGS"
+<\fIhttp://github\.com/visionmedia/git\-extras/issues\fR>
+.
+.SH "SEE ALSO"
+<\fIhttp://github\.com/visionmedia/git\-extras\fR>

man/git-changelog.md

@@ -0,0 +1,49 @@
+git-changelog(1) -- Generate the changelog report
+=================================================
+
+## SYNOPSIS
+
+`git-changelog` [--list]
+
+## DESCRIPTION
+
+  Populates the file named matching _change|history -i_ with the commits since the previous tag or since the project began when no tags are present. Opens the changelog in **$EDITOR** when set.
+
+## OPTIONS
+
+  --list
+
+  Show commit logs from the current version.
+
+## EXAMPLES
+
+  * Updating changelog file:
+
+    $ git changelog
+
+  * Listing commits from the current version:
+
+    $ git changelog --list
+
+    * Docs for git-ignore. Closes #3
+    * Merge branch 'ignore'
+    * Added git-ignore
+    * Fixed <tag> in docs
+    * Install docs
+    * Merge branch 'release'
+    * Added git-release
+    * Passing args to git shortlog
+    * Added --all support to git-count
+    * Initial commit
+
+## AUTHOR
+
+Written by Tj Holowaychuk &lt;<[email protected]>&gt;
+
+## REPORTING BUGS
+
+&lt;<http://github.com/visionmedia/git-extras/issues>&gt;
+
+## SEE ALSO
+
+&lt;<http://github.com/visionmedia/git-extras>&gt;

man/git-commits-since.1

@@ -0,0 +1,30 @@
+.\" generated with Ronn/v0.7.3
+.\" http://github.com/rtomayko/ronn/tree/0.7.3
+.
+.TH "GIT\-COMMITS\-SINCE" "1" "October 2010" "" "Git Extras"
+.
+.SH "NAME"
+\fBgit\-commits\-since\fR \- Show commit logs since some date
+.
+.SH "SYNOPSIS"
+\fBgit\-commits\-since\fR [<date>]
+.
+.SH "DESCRIPTION"
+List of commits since the given \fIdate\fR\.
+.
+.SH "OPTIONS"
+<date>
+.
+.P
+Show commits more recent than \fIdate\fR\. By default, the command shows the commit logs since "last week"\.
+.
+.SH "EXAMPLES"
+.
+.SH "AUTHOR"
+Written by Tj Holowaychuk <\fItj@vision\-media\.ca\fR>
+.
+.SH "REPORTING BUGS"
+<\fIhttp://github\.com/visionmedia/git\-extras/issues\fR>
+.
+.SH "SEE ALSO"
+<\fIhttp://github\.com/visionmedia/git\-extras\fR>