aboutsummaryrefslogtreecommitdiff
path: root/Documentation
Commit message (Collapse)AuthorAge
* git-rev-parse --symbolic-full-nameJunio C Hamano2008-01-06
| | | | | | | | | The plumbing level can understand that the user meant "refs/heads/master" when the user says "master" or "heads/master", but there is no easy way for the scripts to figure it out without duplicating the dwim_ref() logic. Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Update draft release notes for 1.5.4Junio C Hamano2008-01-05
| | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Document git-reset defaults to HEAD if no commit is givenMarco Costalba2008-01-04
| | | | | | Signed-off by: Marco Costalba <mcostalba@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Fix grammar nits in documentation and in code comments.Jim Meyering2008-01-03
| | | | | Signed-off-by: Jim Meyering <meyering@redhat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Merge branch 'maint' of git://linux-nfs.org/~bfields/gitJunio C Hamano2007-12-31
|\ | | | | | | | | | | * 'maint' of git://linux-nfs.org/~bfields/git: Documentation/user-manual.txt: fix typo Documentation: fix remote.<name>.skipDefaultUpdate description
| * Documentation/user-manual.txt: fix typoGustaf Hendeby2007-12-31
| | | | | | | | | | Signed-off-by: Gustaf Hendeby <hendeby@isy.liu.se> Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
| * Documentation: fix remote.<name>.skipDefaultUpdate descriptionJ. Bruce Fields2007-12-31
| | | | | | | | | | | | Fix the subcommand name. Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
* | git-sh-setup: document git_editor() and get_author_ident_from_commit()Miklos Vajna2007-12-28
| | | | | | | | | | | | | | These 2 functions were missing from the manpage. Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Documentation/git-submodule.txt: typofixJunio C Hamano2007-12-27
| | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | GIT 1.5.4-rc2v1.5.4-rc2Junio C Hamano2007-12-26
| | | | | | | | | | | | | | Although everybody was quiet during the Christmas holiday, it's been a week since -rc1, so here is -rc2. Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Merge branch 'ar/commit-cleanup'Junio C Hamano2007-12-26
|\ \ | | | | | | | | | | | | | | | | | | | | | * ar/commit-cleanup: Allow selection of different cleanup modes for commit messages builtin-commit: avoid double-negation in the code. builtin-commit: fix amending of the initial commit t7005: do not exit inside test.
| * | Allow selection of different cleanup modes for commit messagesAlex Riesen2007-12-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Although we traditionally stripped away excess blank lines, trailing whitespaces and lines that begin with "#" from the commit log message, sometimes the message just has to be the way user wants it. For instance, a commit message template can contain lines that begin with "#", the message must be kept as close to its original source as possible if you are converting from a foreign SCM, or maybe the message has a shell script including its comments for future reference. The cleanup modes are default, verbatim, whitespace and strip. The default mode depends on if the message is being edited and will either strip whitespace and comments (if editor active) or just strip the whitespace (for where the message is given explicitely). Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | Fix documentation of --first-parent in git-log and copy it to git-rev-listJunio C Hamano2007-12-26
| | | | | | | | | | | | | | | | | | | | | Credit goes to Avi Kivity for noticing the lack of description in rev-list manual page. Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | shortlog manpage documentation: work around asciidoc markup issuesGustaf Hendeby2007-12-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We wanted to have a list in which one (and the sole, as it happen to be) item in it is ".mailmap", but do not seem to be able to convince AsciiDoc to format it correctly for manpages. Reformat it into a paragraph that describes the said file to work around the issue. Signed-off-by: Gustaf Hendeby <hendeby@isy.liu.se> Acked-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | Documentation: describe 'union' low-level merge driverJunio C Hamano2007-12-22
|/ / | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | parse-options: Add a gitcli(5) man page.Pierre Habouzit2007-12-22
| | | | | | | | | | | | | | This page should hold every information about the git ways to parse command lines, and best practices to be used for scripting. Signed-off-by: Pierre Habouzit <madcoder@debian.org>
* | Documentation: ls-files -v is about "assume unchanged".Junio C Hamano2007-12-21
| | | | | | | | | | | | And refer the reader to update-index documentation. Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | everyday: replace 'prune' and 'repack' with 'gc'Miklos Vajna2007-12-20
| | | | | | | | | | | | | | | | | | In everyday tasks, "repack -a -d -f" won't be used, so there is not much point mentioning "repack". By showing the --prune option to "gc", we can do without mentioning "git prune", too. Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | clean up 1.5.4 release notesJeff King2007-12-20
| | | | | | | | | | | | | | | | Mostly typo and small grammatical fixes with one or two rewordings for clarity. But note the important fix for status.relativepaths. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Mention git-shell's "cvs" substitution in the RelNotesJohannes Schindelin2007-12-20
| | | | | | | | | | | | | | | | | | git shell became much more powerful for existing CVS setups. We should not hide from those people who only read release notes. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Teach diff machinery to display other prefixes than "a/" and "b/"Johannes Schindelin2007-12-20
| | | | | | | | | | | | | | | | | | | | | | | | | | With the new options "--src-prefix=<prefix>", "--dst-prefix=<prefix>" and "--no-prefix", you can now control the path prefixes of the diff machinery. These used to by hardwired to "a/" for the source prefix and "b/" for the destination prefix. Initial patch by Pascal Obry. Sane option names suggested by Linus. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Acked-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | GIT 1.5.4-rc1v1.5.4-rc1Junio C Hamano2007-12-19
| | | | | | | | | | | | | | It's been a week since -rc0, and we have quite a lot of fixes, so here it is. Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Fix some documentation typos.Ralf Wildenhues2007-12-18
| | | | | | | | | | Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Document diff.external and mergetool.<tool>.pathJohannes Schindelin2007-12-17
| | | | | | | | | | | | | | | | | | | | There was no documentation for the config variables diff.external and mergetool.<tool>.path. Noticed by Sebastian Schuberth. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Clean up documentation that references deprecated 'git peek-remote'.Johannes Sixt2007-12-17
| | | | | | | | | | | | | | | | | | | | | | Now that 'git peek-remote' is deprecated and only an alias for 'git ls-remote', it should not be referenced from other manual pages. This also removes the description of the --exec option, which is no longer present. Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Documentation/git-submodule: refer to gitmodules(5)Junio C Hamano2007-12-16
| | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | whitespace: fix config.txt description of indent-with-non-tabJ. Bruce Fields2007-12-16
| | | | | | | | | | | | | | Fix garbled description. Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | rename git-browse--help to git-help--browseJeff King2007-12-16
| | | | | | | | | | | | | | | | | | The convention for helper scripts has been git-$TOOL--$HELPER. Since this is a "browse" helper for the "help" tool, git-help--browse is a more sensible name. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Update draft release notes for 1.5.4Junio C Hamano2007-12-14
| | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Start preparing the API documents.Junio C Hamano2007-12-14
| | | | | | | | | | | | | | | | | | | | | | | | Most of them are still stubs, but the procedure to build the HTML documentation, maintaining the index and installing the end product are there. I placed names of people who are likely to know the most about the topic in the stub files, so that volunteers will know whom to ask questions as needed. Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Retire git-runstatus for real.Junio C Hamano2007-12-14
| | | | | | | | | | | | | | The command was removed from the builtin command list and there was no way to invoke it, but the code was still there. Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Rename git-browse-help helper to git-browse--helpJunio C Hamano2007-12-14
| | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | git-help: add "help.format" config variable.Christian Couder2007-12-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This config variable makes it possible to choose the default format used to display help. This format will be used only if no option like -a|--all|-i|--info|-m|--man|-w|--web is passed to "git-help". The following values are possible for this variable: - "man" --> "man" program is used - "info" --> "info" program is used - "web" --> "git-browse-help" is used By default we still show help using "man". This patch also adds -m|--man command line option to use "man" to allow overriding the "help.format" configuration variable. Note that this patch also revert some recent changes in "git-browse-help" because they prevented to look for config variables in the global configuration file. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Merge branch 'wc/diff'Junio C Hamano2007-12-14
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * wc/diff: Test interaction between diff --check and --exit-code Use shorter error messages for whitespace problems Add tests for "git diff --check" with core.whitespace options Make "diff --check" output match "git apply" Unify whitespace checking diff --check: minor fixups "diff --check" should affect exit status
| * | "diff --check" should affect exit statusWincent Colaiuta2007-12-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "git diff" has a --check option that can be used to check for whitespace problems but it only reported by printing warnings to the console. Now when the --check option is used we give a non-zero exit status, making "git diff --check" nicer to use in scripts and hooks. Signed-off-by: Wincent Colaiuta <win@wincent.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | Documentation: describe pack idx v2linux@horizon.com2007-12-14
|/ / | | | | | | | | | | | | | | Lifted from the log message of c553ca25bd60dc9fd50b8bc7bd329601b81cee66 (pack-objects: learn about pack index version 2). Acked-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | provide advance warning of some future pack default changesNicolas Pitre2007-12-13
| | | | | | | | | | Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Fix spelling mistakes in user manualShawn Bohrer2007-12-13
| | | | | | | | | | | | Signed-off-by: Shawn Bohrer <shawn.bohrer@gmail.com> Acked-by: J. Bruce Fields <bfields@citi.umich.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | GIT 1.5.4-rc0v1.5.4-rc0Junio C Hamano2007-12-12
| | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Merge branch 'cc/help'Junio C Hamano2007-12-12
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * cc/help: RPM spec: Adjust htmldir git-help -w: do not require to be in git repository git.spec.in: remove python_path Documentation: rename git.texi to user-manual.texi Add git-browse-help to .gitignore git-help -i: show info documentation from matching version of git git-help -i: invoke info with document and node name Documentation: add gitman.info target Documentation: describe -w/--web option to "git-help". Use {web,instaweb,help}.browser config options. git-help: add -w|--web option to display html man page in a browser. Documentation: describe -i/--info option to "git-help" git-help: add -i|--info option to display info page.
| * | Documentation: rename git.texi to user-manual.texiJunio C Hamano2007-12-12
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | Documentation: add gitman.info targetJunio C Hamano2007-12-10
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | Merge branch 'master' into cc/helpJunio C Hamano2007-12-10
| |\ \ | | | | | | | | | | | | | | | | This is to primarily pull in MANPATH tweak and help.txt formatting fix from the master branch.
| * | | Documentation: describe -w/--web option to "git-help".Christian Couder2007-12-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also explain that "git instaweb" may use "web.browser" config variable. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | | git-help: add -w|--web option to display html man page in a browser.Christian Couder2007-12-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now when using "git help -w cmd", we will try to show the HTML man page "git-cmd.html" in your prefered web browser. To do that "help.c" code will call a new shell script "git-browse-help". This currently works only if the HTML versions of the man page have been installed in $(htmldir) (typically "/usr/share/doc/git-doc"), so new target to do that is added to "Documentation/Makefile". The browser to use can be configured using the "web.browser" config variable. We try to open a new tab in an existing web browser, if possible. The code in "git-browse-help" is heavily stolen from "git-mergetool" by Theodore Y. Ts'o. Thanks. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | | Documentation: describe -i/--info option to "git-help"Christian Couder2007-12-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Option -i|--info for "git-help" is documented only in the new "git-help.txt" man page, but this new man page is referenced from the "--help" option documentation in the "git.txt" man page. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | Merge branch 'jc/shortlog-e'Junio C Hamano2007-12-12
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * jc/shortlog-e: shortlog: default to HEAD when the standard input is a tty Invert numbers and names in the git-shortlog summary mode. shortlog: document -e option git-shortlog -e: show e-mail address as well
| * | | | shortlog: document -e optionJeff King2007-12-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This shows e-mail address in addition to author's name. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | | git-diff --numstat -z: make it machine readableJunio C Hamano2007-12-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The "-z" format is all about machine parsability, but showing renamed paths as "common/{a => b}/suffix" makes it impossible. The scripts would never have successfully parsed "--numstat -z -M" in the old format. This fixes the output format in a (hopefully minimally) backward incompatible way. * The output without -z is not changed. This has given a good way for humans to view added and deleted lines separately, and showing the path in combined, shorter way would preserve readability. * The output with -z is unchanged for paths that do not involve renames. Existing scripts that do not pass -M/-C are not affected at all. * The output with -z for a renamed path is shown in a format that can easily be distinguished from an unrenamed path. This is based on Jakub Narebski's patch. Bugs and documentation typos are mine. Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | | Documentation: minor grammar fix for "git apply"Wincent Colaiuta2007-12-12
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Wincent Colaiuta <win@wincent.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
generated by cgit v1.2.1 (git 2.18.0) at 2024-07-06 14:59:31 +0000