summaryrefslogtreecommitdiff
path: root/Documentation
AgeCommit message (Collapse)AuthorFilesLines
2007-02-26Documentation: link in 1.5.0.2 material to the top documentation page.Libravatar Junio C Hamano1-1/+3
Signed-off-by: Junio C Hamano <junkio@cox.net>
2007-02-26Documentation: document remote.<name>.tagoptLibravatar Aneesh Kumar K.V1-0/+4
Update config.txt with info regarding tagopt option Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2007-02-26Merge branch 'maint'Libravatar Junio C Hamano2-11/+30
* maint: GIT 1.5.0.2 git-remote: support remotes with a dot in the name Documentation: describe "-f/-t/-m" options to "git-remote add" diff --cc: fix display of symlink conflicts during a merge.
2007-02-26GIT 1.5.0.2Libravatar Junio C Hamano1-11/+17
Signed-off-by: Junio C Hamano <junkio@cox.net>
2007-02-25Documentation: describe "-f/-t/-m" options to "git-remote add"Libravatar Junio C Hamano1-0/+13
Signed-off-by: Junio C Hamano <junkio@cox.net>
2007-02-25Merge branch 'maint'Libravatar Junio C Hamano1-0/+59
* maint: Add Release Notes to prepare for 1.5.0.2 Allow arbitrary number of arguments to git-pack-objects rerere: do not deal with symlinks. rerere: do not skip two conflicted paths next to each other. Don't modify CREDITS-FILE if it hasn't changed.
2007-02-25Add Release Notes to prepare for 1.5.0.2Libravatar Junio C Hamano1-0/+59
Signed-off-by: Junio C Hamano <junkio@cox.net>
2007-02-24Merge branch 'js/etc-config'Libravatar Junio C Hamano1-1/+2
* js/etc-config: Make tests independent of global config files config: read system-wide defaults from /etc/gitconfig
2007-02-24Merge branch 'maint'Libravatar Junio C Hamano1-4/+11
* maint: diff-patch: Avoid emitting double-slashes in textual patch. Reword git-am 3-way fallback failure message. Limit filename for format-patch core.legacyheaders: Use the description used in RelNotes-1.5.0 git-show-ref --verify: Fail if called without a reference Conflicts: builtin-show-ref.c diff.c
2007-02-24core.legacyheaders: Use the description used in RelNotes-1.5.0Libravatar Santi Béjar1-4/+11
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>
2007-02-23git-svn: document --usernameLibravatar Sam Vilain1-0/+5
Also, it turns out that SVN::Ra doesn't attempt to deal with authentication or pass the username to ssh when doing svn+ssh:// URLs Signed-off-by: Eric Wong <normalperson@yhbt.net>
2007-02-23git-svn: allow metadata options to be specified with 'init' and 'clone'Libravatar Eric Wong1-8/+16
Since the options that affect the way metadata is handled in git-svn, should be consistently set/unset throughout history imported by git-svn; it makes sense to allow the user to set certain options from the command-line that will write to the config file when initially creating the repository. Also, fix some formatting issues while we're updating documentation. Signed-off-by: Eric Wong <normalperson@yhbt.net>
2007-02-23git-svn: documentation updatesLibravatar Eric Wong1-34/+81
This documents the 'clone' and 'rebase' commands of git-svn. Additionaly, examples are updated to use them instead of the lower-level 'init' and 'fetch' commands. Signed-off-by: Eric Wong <normalperson@yhbt.net>
2007-02-23git-svn: documentation updates for new functionalityLibravatar Eric Wong1-121/+81
Force the showing of the --minimize flag as an option in the 'migrate' help. Also, fix the usage function to correctly filter out the deprecated aliases. Signed-off-by: Eric Wong <normalperson@yhbt.net>
2007-02-23git-svn: extra safety for noMetadata and useSvmProps usersLibravatar Eric Wong1-5/+21
Make sure we flush our userspace buffers and and fsync(2) .rev_db information to disk if we use these options because we really don't want to lose this information. Also, disallow --use-svm-props and --no-metadata from the command-line because history will be inconsistent if they're only used occasionally. If a user wants to use these options, they must be set in the config so they're always on. Signed-off-by: Eric Wong <normalperson@yhbt.net>
2007-02-23git-svn: enable follow-parent functionality by defaultLibravatar Eric Wong1-1/+2
--no-follow-parent disables and reverts it back to the old default behavior of not following parents (if you don't care for full history). Signed-off-by: Eric Wong <normalperson@yhbt.net>
2007-02-23git-svn: reinstate --no-metadata, add --svn-remote=, variable cleanupsLibravatar Eric Wong1-0/+6
--svn-remote allows the default remote name to be overridden (useful for tracking multiple SVN repositories). Signed-off-by: Eric Wong <normalperson@yhbt.net>
2007-02-23git-svn: remove the 'rebuild' command and make the functionality automaticLibravatar Eric Wong1-38/+3
Since refs/remotes/* are not automatically cloned, we expect the user to be capable of copying those references themselves anyways. Also removed the documentation for --ignore-nodate while we're at it; it has also been made automatic. Signed-off-by: Eric Wong <normalperson@yhbt.net>
2007-02-23git-svn: get rid of additional fetch-argumentsLibravatar Eric Wong1-24/+0
It's not really useful anymore now that we have a better --follow-parent for the valid cases. Any other use of it is not valid. Signed-off-by: Eric Wong <normalperson@yhbt.net>
2007-02-22Merge branch 'maint'Libravatar Junio C Hamano1-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.
2007-02-21Document the new core.bare configuration option.Libravatar Shawn O. Pearce1-0/+12
Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
2007-02-20Allow git-remote to update named groups of remotesLibravatar Theodore Ts'o2-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>
2007-02-20Allow passing of an alternative CVSROOT via -d.Libravatar Simon 'corecode' Schubert1-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>
2007-02-20Link 1.5.0.1 documentation from the main page.Libravatar Junio C Hamano1-0/+4
Signed-off-by: Junio C Hamano <junkio@cox.net>
2007-02-19config: read system-wide defaults from /etc/gitconfigLibravatar Johannes Schindelin1-1/+2
The settings in /etc/gitconfig can be overridden in ~/.gitconfig, which in turn can be overridden in .git/config. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
2007-02-19Teach git-remote to update existing remotes by fetching from themLibravatar Theodore Ts'o2-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>
2007-02-19Merge branch 'maint'Libravatar Junio C Hamano2-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.
2007-02-19git-clone: Sync documentation to usage note.Libravatar Christian Schlotter2-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>
2007-02-18Merge branch 'maint'Libravatar Junio C Hamano2-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
2007-02-18GIT 1.5.0.1Libravatar Junio C Hamano1-6/+11
Signed-off-by: Junio C Hamano <junkio@cox.net>
2007-02-18Documentation/i18n.txt: it is i18n.commitencoding not core.commitencodingLibravatar Fredrik Kuivinen1-6/+6
Similarly for i18n.logoutputencoding. Signed-off-by: Fredrik Kuivinen <frekui@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2007-02-17Update draft release notes for 1.5.1Libravatar Junio C Hamano1-10/+15
Signed-off-by: Junio C Hamano <junkio@cox.net>
2007-02-17Merge branch 'maint'Libravatar Junio C Hamano10-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
2007-02-17Update draft release notes for 1.5.0.1Libravatar Junio C Hamano1-2/+19
Signed-off-by: Junio C Hamano <junkio@cox.net>
2007-02-17name-rev: introduce the --refs=<pattern> optionLibravatar Johannes Schindelin1-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>
2007-02-17Convert update-index references in docs to add.Libravatar Shawn O. Pearce9-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>
2007-02-17Attempt to improve git-rebase lead-in description.Libravatar Shawn O. Pearce1-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>
2007-02-14Merge branch 'maint'Libravatar Junio C Hamano2-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.
2007-02-14Add RelNotes 1.5.0.1Libravatar Junio C Hamano1-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>
2007-02-14Still updating 1.5.0 release notes.Libravatar Junio C Hamano1-5/+2
In cruft removal section we had a cruft we needed to remove. Signed-off-by: Junio C Hamano <junkio@cox.net>
2007-02-14Clarify two backward incompatible repository options.Libravatar Junio C Hamano1-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>
2007-02-14Add RelNotes 1.5.1Libravatar Junio C Hamano1-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>
2007-02-14Document --ignore-space-at-eol option.Libravatar Junio C Hamano1-0/+3
Signed-off-by: Junio C Hamano <junkio@cox.net>
2007-02-13Merge branch 'maint'Libravatar Junio C Hamano3-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
2007-02-13cmd-list: add git-remoteLibravatar Junio C Hamano1-0/+1
Signed-off-by: Junio C Hamano <junkio@cox.net>
2007-02-13Documentation: Drop full-stop from git-fast-import title.Libravatar Junio C Hamano1-1/+1
Signed-off-by: Junio C Hamano <junkio@cox.net>
2007-02-13Minor corrections to release notesLibravatar Nicolas Pitre1-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>
2007-02-13Merge branch 'js/reverse'Libravatar Junio C Hamano1-0/+5
* js/reverse: Teach revision machinery about --reverse
2007-02-13Merge branch 'jc/deprecate'Libravatar Junio C Hamano8-101/+10
As previously announced, diff-stages and resolve are now gone.
2007-02-13Add link to v1.5.0 documentation.Libravatar Junio C Hamano1-0/+4
Signed-off-by: Junio C Hamano <junkio@cox.net>