summaryrefslogtreecommitdiff
path: root/Documentation
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'maint'Junio C Hamano2007-02-221-0/+12
|\ | | | | | | | | | | | | | | * maint: git-diff: fix combined diff Fix 'git commit -a' in a newly initialized repository Include git-gui credits file in dist. Document the new core.bare configuration option.
| * Document the new core.bare configuration option.Shawn O. Pearce2007-02-211-0/+12
| | | | | | | | | | Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Allow git-remote to update named groups of remotesTheodore Ts'o2007-02-202-8/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In response to a feature request from Shawn Pearce, this patch allows a user to update a named group of remotes by using "git remote update <group>", where the group is defined in the config file by remotes.<group>. The default if the named group is not specified is now fetched group remotes.default, instead of remote.fetch, which is what had been previously used. In addition, if remotes.default is not defined, all remotes defined in the config file will be used, as before, but there is now also possible to request that a particular repository to be skipped by default by using the boolean configuration parameter remote.<name>.skipDefaultUpdate. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Allow passing of an alternative CVSROOT via -d.Simon 'corecode' Schubert2007-02-201-1/+6
| | | | | | | | | | | | | | | | | | This is necessary if using CVS in an asymmetric fashion, i.e. when the CVSROOT you are checking out from differs from the CVSROOT you have to commit to. Signed-off-by: Simon 'corecode' Schubert <corecode@fs.ei.tum.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Link 1.5.0.1 documentation from the main page.Junio C Hamano2007-02-201-0/+4
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Teach git-remote to update existing remotes by fetching from themTheodore Ts'o2007-02-192-1/+13
| | | | | | | | | | | | | | | | This allows users to use the command "git remote update" to update all remotes that are being tracked in the repository. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Merge branch 'maint'Junio C Hamano2007-02-192-3/+3
|\ \ | |/ | | | | | | | | | | * maint: Obey NO_C99_FORMAT in fast-import.c. Add a compat/strtoumax.c for Solaris 8. git-clone: Sync documentation to usage note.
| * git-clone: Sync documentation to usage note.Christian Schlotter2007-02-192-3/+3
| | | | | | | | | | | | | | | | | | | | | | 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>
* | Merge branch 'maint'Junio C Hamano2007-02-182-12/+17
|\ \ | |/ | | | | | | | | | | | | | | | | | | * maint: GIT 1.5.0.1 Documentation/i18n.txt: it is i18n.commitencoding not core.commitencoding Read the config in rev-list Conflicts: RelNotes
| * GIT 1.5.0.1v1.5.0.1Junio C Hamano2007-02-181-6/+11
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Documentation/i18n.txt: it is i18n.commitencoding not core.commitencodingFredrik Kuivinen2007-02-181-6/+6
| | | | | | | | | | | | | | 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.1Junio C Hamano2007-02-171-10/+15
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Merge branch 'maint'Junio C Hamano2007-02-1710-24/+48
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | * maint: Update draft release notes for 1.5.0.1 Convert update-index references in docs to add. Attempt to improve git-rebase lead-in description. Do not take mode bits from index after type change. git-blame: prevent argument parsing segfault Make gitk save and restore window pane position on Linux and Cygwin. Make gitk save and restore the user set window position. [PATCH] gitk: Use show-ref instead of ls-remote [PATCH] Make gitk work reasonably well on Cygwin. [PATCH] gitk - remove trailing whitespace from a few lines. Change git repo-config to git config
| * Update draft release notes for 1.5.0.1Junio C Hamano2007-02-171-2/+19
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Convert update-index references in docs to add.Shawn O. Pearce2007-02-179-14/+15
| | | | | | | | | | | | | | | | | | | | 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-171-8/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | name-rev: introduce the --refs=<pattern> optionJohannes Schindelin2007-02-171-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of (or, in addition to) --tags, to use only tags for naming, you can now use --refs=<pattern> to specify a shell glob pattern which the refs must match to be used for naming. Example: $ git name-rev --refs=*v1* 33db5f4d 33db5f4d tags/v1.0rc1^0~1593 Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Merge branch 'maint'Junio C Hamano2007-02-142-6/+29
|\ \ | |/ | | | | | | | | | | | | | | | | | | * maint: GIT-VERSION-FILE: check ./version first. sha1_file.c: Round the mmap offset to half the window size. Make sure packedgitwindowsize is multiple of (pagesize * 2) Add RelNotes 1.5.0.1 Still updating 1.5.0 release notes. git-daemon: Avoid leaking the listening sockets into child processes. Clarify two backward incompatible repository options.
| * Add RelNotes 1.5.0.1Junio C Hamano2007-02-141-0/+20
| | | | | | | | | | | | | | 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-141-5/+2
| | | | | | | | | | | | 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-141-2/+8
| | | | | | | | | | | | | | | | | | | | | | 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>
* | Add RelNotes 1.5.1Junio C Hamano2007-02-141-0/+39
| | | | | | | | | | | | | | | | | | | | | | | | Instead of running around listing the changes near the release, let's keep things nicely organized by summarizing the changes as we merge things to the 'master' branch. I haven't decided how well this will go with people's patch submission procedure yet --- we'll play it by the ear and see what happens. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Document --ignore-space-at-eol option.Junio C Hamano2007-02-141-0/+3
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Merge branch 'maint'Junio C Hamano2007-02-133-15/+14
|\ \ | |/ | | | | | | | | | | | | * maint: Makefile: update check-docs target cmd-list: add git-remote Documentation: Drop full-stop from git-fast-import title. Minor corrections to release notes
| * cmd-list: add git-remoteJunio C Hamano2007-02-131-0/+1
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Documentation: Drop full-stop from git-fast-import title.Junio C Hamano2007-02-131-1/+1
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Minor corrections to release notesNicolas Pitre2007-02-131-14/+12
| | | | | | | | | | | | | | | | | | 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>
* | Merge branch 'js/reverse'Junio C Hamano2007-02-131-0/+5
|\ \ | | | | | | | | | | | | * js/reverse: Teach revision machinery about --reverse
| * | Teach revision machinery about --reverseJohannes Schindelin2007-01-201-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | The option --reverse reverses the order of the commits. [jc: with comments on rev_info.reverse from Simon 'corecode' Schubert.] Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Merge branch 'jc/deprecate'Junio C Hamano2007-02-138-101/+10
|\ \ \ | | | | | | | | | | | | As previously announced, diff-stages and resolve are now gone.
| * | | Remove git-diff-stages.Junio C Hamano2007-02-123-48/+2
| | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | | Remove git-resolve.Junio C Hamano2007-02-126-53/+8
| | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | | Add link to v1.5.0 documentation.Junio C Hamano2007-02-131-0/+4
| |_|/ |/| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Add release notes to the distribution.Junio C Hamano2007-02-134-2/+489
| | | | | | | | | | | | | | | | | | | | | | | | 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-131-16/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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-132-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | 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-121-8/+8
|/ / | | | | | | | | | | | | | | 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-121-1/+1
| | | | | | | | | | | | | | 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-121-11/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-111-0/+131
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Teach git-am to pass -p option down to git-applyJunio C Hamano2007-02-111-3/+4
| | | | | | | | | | | | | | 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-111-1/+1
| | | | | | | | | | | | | | 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-111-0/+16
|\ \ | | | | | | | | | | | | | | | | | | * '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-111-0/+7
| | | | | | | | | | | | Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
| * | fast-import: Hide the pack boundary commits by default.Shawn O. Pearce2007-02-111-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-111-0/+4
| | | | | | | | | | | | | | | Signed-off-by: Michael S. Tsirkin <mst@mellanox.co.il> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Make it easier to override path to asciidoc commandDotan Barak2007-02-111-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | Allow setting the path of asciidoc in only one place when creating the documentation. Signed-off-by: Dotan Barak <dotanb@dev.mellanox.co.il> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Fixed some typos in git-repack docsMukund2007-02-101-3/+3
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Allow aliases to expand to shell commandsTheodore Ts'o2007-02-101-0/+6
|/ / | | | | | | | | | | | | | | If the alias expansion is prefixed with an exclamation point, treat it as a shell command which is run using system(3). Signed-off-by: "Theodore Ts'o" <tytso@mit.edu> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | git-fetch: document automatic tag following.Junio C Hamano2007-02-091-0/+8
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
View Lorry Controller Status