summaryrefslogtreecommitdiff
path: root/Documentation/git.txt
AgeCommit message (Collapse)Author
2010-01-21Merge remote branch 'remotes/trast-doc/for-next'Junio C Hamano
* remotes/trast-doc/for-next: Documentation: spell 'git cmd' without dash throughout Documentation: format full commands in typewriter font Documentation: warn prominently against merging with dirty trees Documentation/git-merge: reword references to "remote" and "pull" Conflicts: Documentation/config.txt Documentation/git-config.txt Documentation/git-merge.txt
2010-01-20Git 1.6.6.1v1.6.6.1Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-01-20Merge branch 'maint-1.6.5' into maintJunio C Hamano
* maint-1.6.5: Git 1.6.5.8 Fix mis-backport of t7002 bash completion: factor submodules into dirty state reset: unbreak hard resets with GIT_WORK_TREE Conflicts: Documentation/git.txt GIT-VERSION-GEN RelNotes
2010-01-20Git 1.6.5.8v1.6.5.8Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-01-10Documentation: spell 'git cmd' without dash throughoutThomas Rast
The documentation was quite inconsistent when spelling 'git cmd' if it only refers to the program, not to some specific invocation syntax: both 'git-cmd' and 'git cmd' spellings exist. The current trend goes towards dashless forms, and there is precedent in 647ac70 (git-svn.txt: stop using dash-form of commands., 2009-07-07) to actively eliminate the dashed variants. Replace 'git-cmd' with 'git cmd' throughout, except where git-shell, git-cvsserver, git-upload-pack, git-receive-pack, and git-upload-archive are concerned, because those really live in the $PATH.
2009-12-23Git 1.6.6v1.6.6Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-12-16Merge branch 'maint' to sync with 1.6.5.7Junio C Hamano
* maint: Git 1.6.5.7 worktree: don't segfault with an absolute pathspec without a work tree ignore unknown color configuration help.autocorrect: do not run a command if the command given is junk Illustrate "filter" attribute with an example
2009-12-16Git 1.6.5.7v1.6.5.7Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-12-11Sync with 1.6.5.6Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-12-10Git 1.6.5.6v1.6.5.6Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-12-05Sync with 1.6.5.5Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-12-05Git 1.6.5.5v1.6.5.5Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-12-03Merge in 1.6.5.4Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-12-03Git 1.6.5.4v1.6.5.4Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-11-16Sync with 1.6.5.3Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-11-16Git 1.6.5.3v1.6.5.3Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-10-26Sync with 1.6.5.2Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-10-26GIT 1.6.5.2v1.6.5.2Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-10-24Merge branch 'maint'Junio C Hamano
* maint: Fix list of released versions in the toc document Do not fail "describe --always" in a tag-less repository
2009-10-24Fix list of released versions in the toc documentJunio C Hamano
2009-10-19Merge branch 'cc/replace-no-replace'Junio C Hamano
* cc/replace-no-replace: git: add --no-replace-objects option to disable replacing
2009-10-17GIT 1.6.5.1v1.6.5.1Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-10-13git: add --no-replace-objects option to disable replacingChristian Couder
Commit dae556b (environment: add global variable to disable replacement) adds a variable to enable/disable replacement, and it is enabled by default for most commands. So there is no way to disable it for some commands, which is annoying when we want to get information about a commit that has been replaced. For example: $ git cat-file -p N would output information about the replacement commit if commit N is replaced. With the "--no-replace-objects" option that this patch adds it is possible to get information about the original commit using: $ git --no-replace-objects cat-file -p N While at it, let's add some documentation about this new option in the "git replace" man page too. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-10-10GIT 1.6.5v1.6.5Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-09-16GIT 1.6.4.4v1.6.4.4Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-09-13GIT 1.6.4.3v1.6.4.3Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-08-29GIT 1.6.4.2v1.6.4.2Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-08-22GIT 1.6.4.1v1.6.4.1Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-08-12Merge branch 'maint-1.6.3' into maintJunio C Hamano
* maint-1.6.3: Change mentions of "git programs" to "git commands" Documentation: merge: one <remote> is required help.c: give correct structure's size to memset()
2009-08-12Change mentions of "git programs" to "git commands"Ori Avtalion
Most of the docs and printouts refer to "commands" when discussing what the end users call via the "git" top-level program. We should refer them as "git programs" when we discuss the fact that the commands are implemented as separate programs, but in other contexts, it is better to use the term "git commands" consistently. Signed-off-by: Ori Avtalion <ori@avtalion.name> Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-07-29GIT 1.6.4v1.6.4Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-07-29Sync with 1.6.3.4Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-06-22Sync with 1.6.3.3Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-06-07Merge branch 'maint'Junio C Hamano
* maint: Documentation: refer to gitworkflows(7) from tutorial and git(1) daemon: Strictly parse the "extra arg" part of the command
2009-06-06Documentation: refer to gitworkflows(7) from tutorial and git(1)Thomas Rast
Add references to the gitworkflows(7) manpage added in f948dd8 (Documentation: add manpage about workflows, 2008-10-19) to both gittutorial(1) and git(1), so that new users might actually discover and read it. Noticed by Randal L. Schwartz. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-06-04Documentation/git.txt: update links to release notesJunio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-05-07GIT 1.6.3v1.6.3Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-04-13GIT 1.6.3-rc0v1.6.3-rc0Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-04-13Documentation/git.txt: GIT 1.6.2.2 has been out for a whileNanako Shiraishi
These links inside "stalenotes" section need to be updated on the master branch every time a new stable or maintenance release is made. Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-04-05add --html-path to get the location of installed HTML docsMarkus Heidelberg
This can be used in GUIs to open installed HTML documentation in the browser. Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-03-15Sync with GIT 1.6.2.1Junio C Hamano
2009-03-04GIT 1.6.2v1.6.2Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-02-07GIT 1.6.2-rc0v1.6.2-rc0Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-01-26Sync with 1.6.1.1Junio C Hamano
2008-12-25GIT 1.6.1v1.6.1Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-12-20Merge branch 'maint' to sync with GIT 1.6.0.6Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-12-08Point "stale" 1.6.0.5 documentation from the main git documentation pagev1.6.1-rc2Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-11-12git.html: Update the links to stale versionsJunio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-09-12GIT 1.6.0.2v1.6.0.2Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-08-24Documentation: clarify pager configurationJonathan Nieder
The unwary user may not know how to disable the -FRSX options. Signed-off-by: Jonathan Nieder <jrnieder@uchicago.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>