aboutsummaryrefslogtreecommitdiff
path: root/Documentation
Commit message (Collapse)AuthorAge
* Begin SubmittingPatches with a check listJohannes Schindelin2007-03-05
| | | | | | | | | It seems that some people prefer a short list to a long text. But even for the latter group, a quick reminder list is useful. So, add a check list to Documentation/SubmittingPatches of what to do to get your patch accepted. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* GIT 1.5.0.3v1.5.0.3Junio C Hamano2007-03-04
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* glossary: Add definitions for dangling and unreachable objectsYasushi SHOJI2007-03-04
| | | | | | | | Define "dangling" and "unreachable" objects. Modified from original text proposed by Yasushi Shoji. Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu> Signed-off-by: Junio C Hamano <junkio@cox.net>
* user-manual: more detailed merge discussionJ. Bruce Fields2007-03-04
| | | | | | | Add more details on conflict, including brief discussion of file stages. Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu> Signed-off-by: Junio C Hamano <junkio@cox.net>
* user-manual: how to replace commits older than most recentJ. Bruce Fields2007-03-04
| | | | | | | | | "Modifying" an old commit by checking it out, --amend'ing it, then rebasing on top of it, is a slightly cumbersome technique, but I've found it useful frequently enough to make it seem worth documenting. Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu> Signed-off-by: Junio C Hamano <junkio@cox.net>
* user-manual: insert earlier of mention content-addressable architectureJ. Bruce Fields2007-03-04
| | | | | | | | The content-addressable design is too important not to be worth at least a brief mention a little earlier on. Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu> Signed-off-by: Junio C Hamano <junkio@cox.net>
* user-manual: ensure generated manual references stylesheetJ. Bruce Fields2007-03-04
| | | | | | | | | | | | | The generated user manual is rather hard to read thanks to the lack of the css that's supposed to be included from docbook-xsl.css. I'm totally ignorant of the toolchain; grubbing through xmlto and related scripts, the easiest way I could find to ensure that the generated html links to the stylesheet is by calling xsltproc directly. Maybe there's some better way. Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu> Signed-off-by: Junio C Hamano <junkio@cox.net>
* user-manual: reset to ORIG_HEAD not HEAD to undo mergeJ. Bruce Fields2007-03-04
| | | | | | | | | | | | As Linus pointed out recently on the mailing list, git reset --hard HEAD^ doesn't undo a merge in the case where the merge did a fast-forward. So the rcommendation here is a little dangerous. Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation: mention module option to git-cvsimportJ. Bruce Fields2007-03-04
| | | | | | | | The git-cvsimport argument that specifies a cvs module to import should probably be included in the default example. Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Document the config variable format.suffixJohannes Schindelin2007-03-03
| | | | | Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation: Correct minor typo in git-add documentation.Christian Schlotter2007-03-01
| | | | | Signed-off-by: Christian Schlotter <schlotter@users.sourceforge.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation/git-send-email.txt: Fix labeled list formattingSergey Vlasov2007-03-01
| | | | | | | | Mark continuation paragraphs of list entries as such to avoid getting literal paragraphs instead. Signed-off-by: Sergey Vlasov <vsu@altlinux.ru> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation/git-quiltimport.txt: Fix labeled list formattingSergey Vlasov2007-03-01
| | | | | | | | Mark the continuation paragraph of a list entry as such to avoid getting a literal paragraph instead. Signed-off-by: Sergey Vlasov <vsu@altlinux.ru> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation/build-docdep.perl: Fix dependencies for included asciidoc filesSergey Vlasov2007-03-01
| | | | | | | | | | | Adding dependencies on included files to the generated man pages is wrong - includes are processed by asciidoc, therefore the intermediate Docbook XML files really depend on included files. Because of these wrong dependencies the man pages were not rebuilt properly if the intermediate XML files were left in the tree. Signed-off-by: Sergey Vlasov <vsu@altlinux.ru> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Start preparing Release Notes for 1.5.0.3Junio C Hamano2007-02-28
|
* Documentation: git-remote add [-t <branch>] [-m <branch>] [-f] name urlJunio C Hamano2007-02-28
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* Include config.mak in doc/MakefileUwe Kleine-König2007-02-28
| | | | | | | | config.mak.autogen is already there. Without this change it is not possible to override mandir in config.mak. Signed-off-by: Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Fix minor typos/grammar in user-manual.txtMichael Coleman2007-02-27
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* Correct ordering in git-cvsimport's option documentationMichael Poole2007-02-27
| | | | | | | | | A pair of commits on January 8th added option documentation (for -a, -S and -L) in the middle of the documentation for the -A option. This makes -A's documentation contiguous again. Signed-off-by: Michael Poole <mdpoole@troilus.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Fix git-show man page formatting in the EXAMPLES sectionTheodore Tso2007-02-27
| | | | | | | | Fix asciidoc markup so that the man page is properly formatted in the EXAMPLES section. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu> Signed-off-by: Junio C Hamano <junkio@cox.net>
* GIT 1.5.0.2v1.5.0.2Junio C Hamano2007-02-26
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation: describe "-f/-t/-m" options to "git-remote add"Junio C Hamano2007-02-25
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* Add Release Notes to prepare for 1.5.0.2Junio C Hamano2007-02-25
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* core.legacyheaders: Use the description used in RelNotes-1.5.0Santi Béjar2007-02-24
| | | | | | | It explains what it does and why, and says how to use the new format. Signed-off-by: Santi Béjar <sbejar@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Document the new core.bare configuration option.Shawn O. Pearce2007-02-21
| | | | | Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* git-clone: Sync documentation to usage note.Christian Schlotter2007-02-19
| | | | | | | | | | | Documentation advertises the new `--depth <n>' parameter with an equal sign, while the usage notes (shown after `git-clone --help') do not. If I understood git-clone's source code correctly, the version without the equal sign is correct, which is why this patch syncs documentation to the usage note. Signed-off-by: Christian Schlotter <schlotter@users.sourceforge.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* GIT 1.5.0.1v1.5.0.1Junio C Hamano2007-02-18
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation/i18n.txt: it is i18n.commitencoding not core.commitencodingFredrik Kuivinen2007-02-18
| | | | | | | Similarly for i18n.logoutputencoding. Signed-off-by: Fredrik Kuivinen <frekui@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Update draft release notes for 1.5.0.1Junio C Hamano2007-02-17
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* Convert update-index references in docs to add.Shawn O. Pearce2007-02-17
| | | | | | | | | | Since `git add` is the approved porcelain for an end-user to invoke when they want to manipulate the index, porcelain documentation should steer the user to this command rather than the pure plumbing update-index. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Attempt to improve git-rebase lead-in description.Shawn O. Pearce2007-02-17
| | | | | | | | | | | | | It was mentioned on #git this morning that the lead-in description of git-rebase is very confusing. Too many branch this and branch that in a very short run of text. This new description attempts to walk the user through the command syntax, while also describing exactly what git-rebase is doing to their repository. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Add RelNotes 1.5.0.1Junio C Hamano2007-02-14
| | | | | | | In the same spirit as commit 6fc66686, let's keep notes as we fix things. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Still updating 1.5.0 release notes.Junio C Hamano2007-02-14
| | | | | | In cruft removal section we had a cruft we needed to remove. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Clarify two backward incompatible repository options.Junio C Hamano2007-02-14
| | | | | | | | | | | It was unclear if the backward compatible features were disabled or the configuration variables that controls them were set to false by default from the description. Obviously we meant the former, but the problem was made worse by the fact that one configuration variable breaks compatibility when set to true and the other one breaks it when set to false. Signed-off-by: Junio C Hamano <junkio@cox.net>
* cmd-list: add git-remoteJunio C Hamano2007-02-13
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation: Drop full-stop from git-fast-import title.Junio C Hamano2007-02-13
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* Minor corrections to release notesNicolas Pitre2007-02-13
| | | | | | | | | Update section about warning when leaving a detached head. Also fix a few indentations that weren't like the rest of the file. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Add release notes to the distribution.Junio C Hamano2007-02-13
| | | | | | | | This also adds a hook in the Makefile I can use to automatically include pointers to documentation for older releases when updating the pages at http://kernel.org/pub/software/scm/git/docs/. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation: Moving out of detached HEAD does not warn anymore.Junio C Hamano2007-02-13
| | | | | | | | | The documentation still talked about the unnecessary 'safety' in git-checkout. Pointed out by Matthias Lederhofer. Signed-off-by: Junio C Hamano <junkio@cox.net>
* git-gc: run pack-refs by default unless the repo is bareJohannes Schindelin2007-02-13
| | | | | | | | The config variable gc.packrefs is tristate now: "true", "false" and "notbare", where "notbare" is the default. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Clarify that git-update-server-info should be run for every git-pushPavel Roskin2007-02-12
| | | | | | | | The old text suggested that git-update-server-info only needs to be run if new tags or branches are created, but not for new commits. Signed-off-by: Pavel Roskin <proski@gnu.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* git merge documentation: -m is optionalMatthias Lederhofer2007-02-12
| | | | | | | Changed -m=<msg> to -m <msg> too. Signed-off-by: Matthias Lederhofer <matled@gmx.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* fast-import: Support reusing 'from' and brown paper bag fix reset.Shawn O. Pearce2007-02-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was suggested on the mailing list that being able to use `from` in any commit to reset the current branch is useful in some types of importers, such as a darcs importer. We originally did not permit resetting an existing branch with a new `from` command during a `commit` command, but this restriction was only to help debug the hacked up cvs2svn that Jon Smirl was developing in parallel with git-fast-import. It is probably more of a problem to disallow it than to allow it. So now we permit a `from` during any `commit`. While making the changes required to permit multiple `from` commands on the same branch, I discovered we no longer needed the last_commit field to be set to 0 during a reset, so that was removed. (Reset was originally setting the field to 0 to signal cmd_from() that it was OK to execute on the branch.) While poking around in this section of fast-import I also realized the `reset` command was not working as intended if the corresponding `from` command was omitted (as allowed by the BNF grammar and the code). If `from` was omitted we cleared out the tree but we left the tree SHA-1 and parent commit SHA-1 intact. This is not what the user intended in this case. Instead they would be trying to reset the branch to have no parent and to have no tree, making the branch look new-born during the next commit. We now clear these SHA-1 values during `reset`, ensuring the branch looks new-born if `from` does not get supplied. New test cases for these were also added. Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* Add discussion section to git-tag documentation.Junio C Hamano2007-02-11
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* Teach git-am to pass -p option down to git-applyJunio C Hamano2007-02-11
| | | | | | | This is originally from Andy Parkins whose patch used --patchdepth; let's use -p which is more in line with the underlying git-apply. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation: git-rebase -C<n>Junio C Hamano2007-02-11
| | | | | | | Replace -CNUM in Synopsis section with -C<n> to make it consistent with the description text. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Merge branch 'master' of git://repo.or.cz/git/fastimportJunio C Hamano2007-02-11
|\ | | | | | | | | | | | | * 'master' of git://repo.or.cz/git/fastimport: bash: Hide git-fast-import. fast-import: Add tip about importing renames. fast-import: Hide the pack boundary commits by default.
| * fast-import: Add tip about importing renames.Shawn O. Pearce2007-02-11
| | | | | | | | Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
| * fast-import: Hide the pack boundary commits by default.Shawn O. Pearce2007-02-11
| | | | | | | | | | | | | | | | | | | | | | | | | | Most users don't need the pack boundary information that fast-import was printing to standard output, especially if they were calling it with --quiet. Those users who do want this information probably want it captured so they can go back and use it to repack the imported repository. So dumping the boundary commits to a log file makes more sense then printing them to standard output. Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* | Document that git-am can read standard input.Michael S. Tsirkin2007-02-11
| | | | | | | | | | Signed-off-by: Michael S. Tsirkin <mst@mellanox.co.il> Signed-off-by: Junio C Hamano <junkio@cox.net>
generated by cgit v1.2.1 (git 2.18.0) at 2025-02-03 15:25:47 +0000