aboutsummaryrefslogtreecommitdiff
path: root/Documentation
Commit message (Collapse)AuthorAge
* Git 1.7.8.4v1.7.8.4Junio C Hamano2012-01-18
| | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Merge branch 'maint-1.7.7' into maintJunio C Hamano2012-01-18
|\ | | | | | | | | | | | | | | | | * maint-1.7.7: Git 1.7.7.6 diff-index: enable recursive pathspec matching in unpack_trees Conflicts: GIT-VERSION-GEN
| * Git 1.7.7.6v1.7.7.6Junio C Hamano2012-01-18
| | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Update draft release notes to 1.7.8.4Junio C Hamano2012-01-12
| | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Merge branch 'maint-1.7.7' into maintJunio C Hamano2012-01-12
|\ \ | |/ | | | | | | | | | | * maint-1.7.7: Update draft release notes to 1.7.7.6 Update draft release notes to 1.7.6.6 thin-pack: try harder to use preferred base objects as base
| * Update draft release notes to 1.7.7.6Junio C Hamano2012-01-12
| | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * Merge branch 'maint-1.7.6' into maint-1.7.7Junio C Hamano2012-01-12
| |\ | | | | | | | | | | | | | | | * maint-1.7.6: Update draft release notes to 1.7.6.6 thin-pack: try harder to use preferred base objects as base
| | * Update draft release notes to 1.7.6.6Junio C Hamano2012-01-12
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | Prepare for 1.7.8.4Junio C Hamano2012-01-10
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | Merge the attributes fix in from maint-1.6.7 branchJunio C Hamano2012-01-10
|\ \ \ | |/ / | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | Prepare for 1.7.7.6Junio C Hamano2012-01-10
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | Merge the attributes fix in from maint-1.6.6 branchJunio C Hamano2012-01-10
| |\ \ | | |/ | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
| | * Prepare for 1.7.6.6Junio C Hamano2012-01-10
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
| | * Documentation: rerere's rr-cache auto-creation and rerere.enabledJunio C Hamano2012-01-10
| | | | | | | | | | | | | | | | | | | | | | | | The description of rerere.enabled left the user in the dark as to who might create an rr-cache directory. Add a note that simply invoking rerere does this. Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | Git 1.7.8.3v1.7.8.3Junio C Hamano2012-01-06
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | Merge branch 'maint-1.7.7' into maintJunio C Hamano2012-01-06
|\ \ \ | |/ / | | | | | | | | | * maint-1.7.7: Documentation: rerere.enabled is the primary way to configure rerere
| * | Merge branch 'maint-1.7.6' into maint-1.7.7Junio C Hamano2012-01-06
| |\ \ | | |/ | | | | | | | | | * maint-1.7.6: Documentation: rerere.enabled is the primary way to configure rerere
| | * Documentation: rerere.enabled is the primary way to configure rerereThomas Rast2012-01-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The wording seems to suggest that creating the directory is needed and the setting of rerere.enabled is only for disabling the feature by setting it to 'false'. But the configuration is meant to be the primary control and setting it to 'true' will enable it; the rr-cache directory will be created as necessary and the user does not have to create it. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | Merge branch 'maint-1.7.7' into maintJunio C Hamano2012-01-03
|\ \ \ | |/ / | | | | | | | | | | | | | | | * maint-1.7.7: docs: describe behavior of relative submodule URLs Documentation: read-tree --prefix works with existing subtrees Add MYMETA.json to perl/.gitignore
| * | Merge branch 'maint-1.7.6' into maint-1.7.7Junio C Hamano2012-01-03
| |\ \ | | |/ | | | | | | | | | | | | * maint-1.7.6: Documentation: read-tree --prefix works with existing subtrees Add MYMETA.json to perl/.gitignore
| | * Documentation: read-tree --prefix works with existing subtreesClemens Buchacher2012-01-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | Since 34110cd4 (Make 'unpack_trees()' have a separate source and destination index) it is no longer true that a subdirectory with the same prefix must not exist. Signed-off-by: Clemens Buchacher <drizzd@aon.at> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | docs: describe behavior of relative submodule URLsJens Lehmann2012-01-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since the relative submodule URLs have been introduced in f31a522a2d, they do not conform to the rules for resolving relative URIs but rather to those of relative directories. Document that behavior. Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | Git 1.7.8.2v1.7.8.2Junio C Hamano2011-12-28
| | | | | | | | | | | | | | | | | | | | | Contains accumulated fixes since 1.7.8 that have been merged to the 'master' branch in preparation for the 1.7.9 release. Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | Merge branch 'tr/doc-sh-setup' into maintJunio C Hamano2011-12-28
|\ \ \ | | | | | | | | | | | | | | | | * tr/doc-sh-setup: git-sh-setup: make require_clean_work_tree part of the interface
| * | | git-sh-setup: make require_clean_work_tree part of the interfaceThomas Rast2011-12-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 92c62a3 (Porcelain scripts: Rewrite cryptic "needs update" error message, 2010-10-19) refactored git's own checking to a function in git-sh-setup. This is a very useful thing for script writers, so document it. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | Merge branch 'jk/doc-fsck' into maintJunio C Hamano2011-12-28
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * jk/doc-fsck: docs: brush up obsolete bits of git-fsck manpage
| * | | | docs: brush up obsolete bits of git-fsck manpageJeff King2011-12-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After the description and options, the fsck manpage contains some discussion about what it does. Over time, this discussion has become somewhat obsolete, both in content and formatting. In particular: 1. There are many options now, so starting the discussion with "It tests..." makes it unclear whether we are talking about the last option, or about the tool in general. Let's start a new "discussion" section and make our antecedent more clear. 2. It gave an example for --unreachable using for-each-ref to mention all of the heads, saying that it will do "a _lot_ of verification". This is hopelessly out-of-date, as giving no arguments will check much more (reflogs, the index, non-head refs). 3. It goes on to mention tests "to be added" (like tree object sorting). We now have these tests. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | | Merge branch 'jc/advice-doc' into maintJunio C Hamano2011-12-28
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * jc/advice-doc: advice: Document that they all default to true
| * | | | | advice: Document that they all default to trueJunio C Hamano2011-12-18
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By definition, the default value of "advice.*" variables must be true and they all control various additional help messages that are designed to aid new users. Setting one to false is to tell Git that the user understands the nature of the error and does not need the additional verbose help message. Also fix the asciidoc markup for linkgit:git-checkout[1] in the description of the detachedHead advice by removing an excess colon. Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | | Merge branch 'jk/maint-mv' into maintJunio C Hamano2011-12-28
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * jk/maint-mv: mv: be quiet about overwriting mv: improve overwrite warning mv: make non-directory destination error more clear mv: honor --verbose flag docs: mention "-k" for both forms of "git mv"
| * | | | | mv: honor --verbose flagJeff King2011-12-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code for a verbose flag has been here since "git mv" was converted to C many years ago, but actually getting the "-v" flag from the command line was accidentally lost in the transition. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | | | | docs: mention "-k" for both forms of "git mv"Jeff King2011-12-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The "git mv" synopsis shows two forms: renaming a file, and moving files into a directory. They can both make use of the "-k" flag to ignore errors, so mention it in both places. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | | | Merge branch 'ci/stripspace-docs' into maintJunio C Hamano2011-12-28
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ci/stripspace-docs: Update documentation for stripspace
| * | | | | | Update documentation for stripspaceConrad Irwin2011-12-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tell the user what this command is intended for, and expand the description of what it does. Signed-off-by: Conrad Irwin <conrad.irwin@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | | | | Git 1.7.8.1v1.7.8.1Junio C Hamano2011-12-21
| |_|/ / / / |/| | | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | | | Update draft release notes for 1.7.8.1Junio C Hamano2011-12-13
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | | | Merge branch 'maint-1.7.7' into maintJunio C Hamano2011-12-13
|\ \ \ \ \ \ | |/ / / / / |/| | | / / | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-13
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | | | Merge branch 'maint-1.7.6' into maint-1.7.7Junio C Hamano2011-12-13
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-13
| | |/ / | | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | Merge branch 'maint-1.7.7' into maintJunio C Hamano2011-12-09
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | * maint-1.7.7: am: don't persist keepcr flag mingw: give waitpid the correct signature git symbolic-ref: documentation fix
| * | | git symbolic-ref: documentation fixMichael Haggerty2011-12-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The old "git symbolic-ref" manpage seemed to imply in one place that symlinks are still the default way to represent symbolic references and in another that symlinks are deprecated. Fix the text and shorten the justification for the change of implementation. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | Merge branch 'js/merge-edit-option'Junio C Hamano2011-12-05
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * js/merge-edit-option: Documentation: fix formatting error in merge-options.txt
| * | | | Documentation: fix formatting error in merge-options.txtJack Nagel2011-12-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The first paragraph inside of a list item does not need a preceding line consisting of a single '+', and in fact this causes the text to be misrendered. Fix it. Signed-off-by: Jack Nagel <jacknagel@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | | Git 1.7.8v1.7.8Junio C Hamano2011-12-02
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | | Git 1.7.8-rc4v1.7.8-rc4Junio C Hamano2011-11-28
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | | builtin-reset: Documentation updateVincent van Ravesteijn2011-11-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The second mode of 'git reset' is defined by the --patch option, while the third mode is defined by the <mode> option. Hence, these options are mandatory in the description of the individual modes. Signed-off-by: Vincent van Ravesteijn <vfr@lyx.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | | Update 1.7.8 draft release notes in preparation for rc4Junio C Hamano2011-11-22
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | | Merge branch 'jn/revert-quit'Junio C Hamano2011-11-22
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * jn/revert-quit: revert: remove --reset compatibility option revert: introduce --abort to cancel a failed cherry-pick revert: write REVERT_HEAD pseudoref during conflicted revert revert: improve error message for cherry-pick during cherry-pick revert: rearrange pick_revisions() for clarity revert: rename --reset option to --quit
| * | | | | revert: introduce --abort to cancel a failed cherry-pickJonathan Nieder2011-11-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After running some ill-advised command like "git cherry-pick HEAD..linux-next", the bewildered novice may want to return to more familiar territory. Introduce a "git cherry-pick --abort" command that rolls back the entire cherry-pick sequence and places the repository back on solid ground. Just like "git merge --abort", this internally uses "git reset --merge", so local changes not involved in the conflict resolution are preserved. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
generated by cgit v1.2.1 (git 2.18.0) at 2024-09-12 15:01:50 +0000