delta/git.git/Documentation, branch jc/signed-commit

gpg-interface: allow use of a custom GPG binary

2011-11-29T20:30:02+00:00

Signed-off-by: Junio C Hamano

commit-tree: teach -m/-F options to read logs from elsewhere

2011-11-13T06:25:07+00:00

Just like "git commit" does.

Signed-off-by: Junio C Hamano

Merge branch 'js/merge-edit-option'

2011-10-19T17:49:27+00:00

* js/merge-edit-option:
  Teach merge the '[-e|--edit]' option

Conflicts:
	builtin/merge.c

Merge branch 'rs/diff-whole-function'

2011-10-19T17:49:13+00:00

* rs/diff-whole-function:
  diff: add option to show whole functions as context
  xdiff: factor out get_func_line()

Merge branch 'jn/gitweb-manpages'

2011-10-19T04:59:11+00:00

* jn/gitweb-manpages:
  gitweb: Add gitweb manpages to 'gitweb' package in git.spec
  Documentation: Add gitweb config variables to git-config(1)
  Documentation: Link to gitweb(1) and gitweb.conf(5) in other manpages
  gitweb: Add gitweb(1) manpage for gitweb itself
  gitweb: Add gitweb.conf(5) manpage for gitweb configuration files

Update draft release notes to 1.7.8

2011-10-18T05:08:25+00:00

Signed-off-by: Junio C Hamano

Documentation: Add gitweb config variables to git-config(1)

2011-10-16T18:09:35+00:00

Add a list of gitweb config variables to git-config(1) manpage, just
linking to gitweb(1) or gitweb.conf(5).

Signed-off-by: Jakub Narebski 
Signed-off-by: Junio C Hamano

Documentation: Link to gitweb(1) and gitweb.conf(5) in other manpages

2011-10-16T18:09:35+00:00

Add link to gitweb(1) in "SEE ALSO" section of git-instaweb(1) manpage,
and "Ancillary Commands" section of git(1) manpage (the latter by the
way of command-list.txt file).

Signed-off-by: Jakub Narebski 
Signed-off-by: Junio C Hamano

gitweb: Add gitweb(1) manpage for gitweb itself

2011-10-16T18:09:34+00:00

Most of what is in gitweb.txt it has been pulled directly from the
README and INSTALL files of gitweb.

Current version is somewhat based on structure of SVN::Web manpage
(one of web interfaces for Subversion).

gitweb.conf(5) i.e. gitweb configuration manpage now refers to
appropriate sections in gitweb(1).  gitweb/README now refers to
gitweb/INSTALL and gitweb(1) manpage.  gitweb/INSTALL now refers to
gitweb.conf(5) and gitweb(1).

Inspired-by: Drew Northup 
Signed-off-by: Jakub Narebski 
Signed-off-by: Junio C Hamano

gitweb: Add gitweb.conf(5) manpage for gitweb configuration files

2011-10-16T18:09:34+00:00

Much of what is in gitweb.conf.txt has been pulled directly from the
README file of gitweb.  The manpage was supplemented with description
of missing gitweb config variables, and with description of gitweb's
%features.

There remains a bit of redundancy, which should be reduced if
possible... but I think some of duplication of information is
inevitable.

[jn: Improved, extended, removed duplicate info from README]

Signed-off-by: Drew Northup 
Signed-off-by: Jakub Narebski 
Helped-by: Jonathan Nieder 
Signed-off-by: Junio C Hamano