summaryrefslogtreecommitdiff
path: root/Documentation/git.txt
Commit message (Collapse)AuthorAgeFilesLines
* Git 1.7.9.6v1.7.9.6Junio C Hamano2012-04-021-2/+4
| | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Git 1.7.9.5v1.7.9.5Junio C Hamano2012-03-261-1/+2
| | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Documentation: improve description of GIT_EDITOR and preference orderRodrigo Silva (MestreLion)2012-03-261-0/+6
| | | | | | | | | | | | | | | | | Previously GIT_EDITOR was not listed in git(1) "Environment Variables" section, which could be very confusing to users. Include it in "other" subsection along with a link to git-var(1), since that is the page that fully describes all places where editor can be set and also their preference order. Also, git-var(1) did not say that hardcoded fallback 'vi' may have been changed at build time. A user could be puzzled if 'nano' pops up even when none of the mentioned environment vars or config.editor are set. Clarify this. Ideally, the build system should be changed to reflect the chosen fallback editor when creating the man pages. Not sure if that is even possible though. Signed-off-by: Rodrigo Silva (MestreLion) <linux@rodrigosilva.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Git 1.7.9.4v1.7.9.4Junio C Hamano2012-03-121-1/+2
| | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Git 1.7.9.3v1.7.9.3Junio C Hamano2012-03-051-1/+2
| | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Git 1.7.9.2v1.7.9.2Junio C Hamano2012-02-221-1/+2
| | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* man: rearrange git synopsis to fit in 80 linesZbigniew Jędrzejewski-Szmek2012-02-161-3/+3
| | | | | | | | | The line was extended in 2dd8c3 ('git: add --info-path and --man-path options'), and the formatted man output stopped fitting into the 80 column window. Signed-off-by: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Git 1.7.9.1v1.7.9.1Junio C Hamano2012-02-141-1/+2
| | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Sync with 1.7.6.6Junio C Hamano2012-02-051-1/+2
|\ | | | | | | | | | | * maint-1.7.8: Git 1.7.6.6 imap-send: remove dead code
| * Sync with 1.7.6.6Junio C Hamano2012-02-051-1/+2
| |\ | | | | | | | | | | | | | | | * maint-1.7.7: Git 1.7.6.6 imap-send: remove dead code
| | * Sync with 1.7.6.6Junio C Hamano2012-02-051-1/+2
| | |\ | | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
| | | * Git 1.7.6.6v1.7.6.6maint-1.7.6Junio C Hamano2012-02-051-1/+2
| | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | Git 1.7.9v1.7.9Junio C Hamano2012-01-271-0/+5
|/ / / | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | Git 1.7.8.4v1.7.8.4Junio C Hamano2012-01-181-2/+4
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | Git 1.7.8.3v1.7.8.3Junio C Hamano2012-01-061-1/+4
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | Merge branch 'maint-1.7.7' into maintJunio C Hamano2011-12-131-2/+7
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * maint-1.7.7: Git 1.7.7.5 Git 1.7.6.5 blame: don't overflow time buffer fetch: create status table using strbuf checkout,merge: loosen overwriting untracked file check based on info/exclude cast variable in call to free() in builtin/diff.c and submodule.c apply: get rid of useless x < 0 comparison on a size_t type Conflicts: Documentation/git.txt GIT-VERSION-GEN RelNotes builtin/fetch.c
| * | Git 1.7.7.5v1.7.7.5Junio C Hamano2011-12-131-1/+5
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | Merge branch 'maint-1.7.6' into maint-1.7.7Junio C Hamano2011-12-131-1/+2
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * maint-1.7.6: Git 1.7.6.5 blame: don't overflow time buffer fetch: create status table using strbuf Conflicts: Documentation/git.txt GIT-VERSION-GEN RelNotes
| | * Git 1.7.6.5v1.7.6.5Junio C Hamano2011-12-131-1/+2
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | Git 1.7.8v1.7.8Junio C Hamano2011-12-021-0/+5
|/ / | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Git 1.7.7.1v1.7.7.1Junio C Hamano2011-10-231-1/+2
| | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Git 1.7.7v1.7.7Junio C Hamano2011-09-301-0/+5
| | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Merge 1.7.6.4 inJunio C Hamano2011-09-231-1/+2
|\ \ | |/ | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * Git 1.7.6.4v1.7.6.4Junio C Hamano2011-09-231-1/+2
| | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Sync with 1.7.6.3Junio C Hamano2011-09-121-1/+2
|\ \ | |/ | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * Git 1.7.6.3v1.7.6.3Junio C Hamano2011-09-121-1/+2
| | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Sync with 1.7.6.2Junio C Hamano2011-09-061-2/+3
|\ \ | |/ | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * Git 1.7.6.2v1.7.6.2Junio C Hamano2011-09-061-2/+3
| | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Sync with 1.7.6.1Junio C Hamano2011-08-241-1/+2
|\ \ | |/ | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * Git 1.7.6.1v1.7.6.1Junio C Hamano2011-08-241-1/+2
| | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * Merge branch 'nk/ref-doc' into maintJunio C Hamano2011-08-011-4/+3
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * nk/ref-doc: glossary: clarify description of HEAD glossary: update description of head and ref glossary: update description of "tag" git.txt: de-emphasize the implementation detail of a ref check-ref-format doc: de-emphasize the implementation detail of a ref git-remote.txt: avoid sounding as if loose refs are the only ones in the world git-remote.txt: fix wrong remote refspec
* | \ Merge branch 'js/ref-namespaces'Junio C Hamano2011-08-171-2/+11
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * js/ref-namespaces: ref namespaces: tests ref namespaces: documentation ref namespaces: Support remote repositories via upload-pack and receive-pack ref namespaces: infrastructure Fix prefix handling in ref iteration functions
| * | | ref namespaces: documentationJosh Triplett2011-07-111-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document the namespace mechanism in a new gitnamespaces(7) page. Reference it from receive-pack and upload-pack. Document the new --namespace option and GIT_NAMESPACE environment variable in git(1), and reference gitnamespaces(7). Add a sample Apache configuration to http-backend(1) to support namespaced repositories, and reference gitnamespaces(7). Signed-off-by: Josh Triplett <josh@joshtriplett.org> Signed-off-by: Jamey Sharp <jamey@minilop.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | Merge branch 'nk/ref-doc'Junio C Hamano2011-07-131-4/+3
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/| | | | | | | | | | | | | | | | | | | * nk/ref-doc: glossary: clarify description of HEAD glossary: update description of head and ref glossary: update description of "tag" git.txt: de-emphasize the implementation detail of a ref check-ref-format doc: de-emphasize the implementation detail of a ref git-remote.txt: avoid sounding as if loose refs are the only ones in the world git-remote.txt: fix wrong remote refspec
| * | git.txt: de-emphasize the implementation detail of a refJunio C Hamano2011-06-231-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is an unimportant implementation detail that branches and tags are stored somewhere under $GIT_DIR/refs directory, or the name of the commit that will become the parent of the next commit is stored in $GIT_DIR/HEAD. What is more important is that branches live in refs/heads and tags live in refs/tags hierarchy in the ref namespace, and HEAD means the tip of the current branch. Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | Git 1.7.6v1.7.6Junio C Hamano2011-06-261-0/+5
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | Sync with 1.7.5.4v1.7.6-rc0Junio C Hamano2011-06-011-1/+2
|\ \ \ | |/ / | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | Git 1.7.5.4v1.7.5.4Junio C Hamano2011-06-011-1/+2
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | Sync with 1.7.5.3Junio C Hamano2011-05-261-1/+2
|\ \ \ | |/ / | | / | |/ |/| Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * Git 1.7.5.3v1.7.5.3Junio C Hamano2011-05-261-1/+2
| | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Merge 1.7.5.2 inJunio C Hamano2011-05-191-1/+2
|\ \ | |/ | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * Git 1.7.5.2v1.7.5.2Junio C Hamano2011-05-191-1/+2
| | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Merge branch 'js/info-man-path'Junio C Hamano2011-05-061-3/+11
|\ \ | |/ |/| | | | | | | | | | | | | * js/info-man-path: Documentation: clarify meaning of --html-path, --man-path, and --info-path git: add --info-path and --man-path options Conflicts: Makefile
| * Documentation: clarify meaning of --html-path, --man-path, and --info-pathJonathan Nieder2011-05-021-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These options tell UI programs where git put its documentation, so "Help" actions can show the documentation for *this* version of git without regard to how MANPATH and INFOPATH are set up. Details: . Each variable tells where documentation is expected to be. They do not indicate whether documentation was actually installed. . The output of "git --html-path" is an absolute path and can be used in "file://$(git --html-path)/git-add.html" to name the HTML file documenting a particular command. . --man-path names a manual page hierarchy (e.g., /home/user/share/man). Its output can be passed to "man -M" or put at the beginning of $MANPATH. . --info-path names a directory with info files (e.g., /home/user/share/info). Its output is suitable as an argument to "info -d" or for inclusion in $INFOPATH. Helped-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * git: add --info-path and --man-path optionsJon Seymour2011-05-011-1/+9
| | | | | | | | | | | | | | | | | | Similar to the way the --html-path option lets UI programs learn where git has its HTML documentation pages, expose the other two paths used to store the documentation pages of these two types. Signed-off-by: Jon Seymour <jon.seymour@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Git 1.7.5.1v1.7.5.1Junio C Hamano2011-05-041-1/+2
|/ | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Git 1.7.5v1.7.5Junio C Hamano2011-04-231-0/+5
| | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Git 1.7.5-rc3v1.7.5-rc3Junio C Hamano2011-04-191-1/+2
| | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Merge branch 'maint'Junio C Hamano2011-04-141-1/+0
|\ | | | | | | | | | | | | * maint: archive: document limitation of tar.umask config setting t3306,t5304: avoid clock skew issues git.txt: fix list continuation
| * git.txt: fix list continuationMichael J Gruber2011-04-141-1/+0
| | | | | | | | | | | | | | | | | | Remove a spurious empty line which prevented asciidoc from recognizing a list continuation mark ('+'), so that it does not get output literally any more. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
View Lorry Controller Status