aboutsummaryrefslogtreecommitdiff
path: root/Documentation
Commit message (Collapse)AuthorAge
* git-fetch --upload-pack: disambiguate.Junio C Hamano2006-01-26
| | | | | | | | | Johannes noticed the recent addition of this new flag inadvertently took over existing --update-head-ok (-u). Require longer abbreviation to this new option which would be needed in a rare setup. Signed-off-by: Junio C Hamano <junkio@cox.net>
*-. Merge branches 'jc/clone', 'md/env' and 'mo/path'Junio C Hamano2006-01-25
|\ \
| | * git-fetch: pass --upload-pack to fetch-packMichal Ostrowski2006-01-24
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without this, there is no way to specify a remote executable when invoking git-pull/git-fetch as there is for git-clone. [jc: I have a mild suspicion that this is a broken environment (aka sysadmin disservice). It may be legal to configure your sshd to spawn named program without involving shell at all, and if your sysadmin does so and you have your git programs under your home directory, you would need something like this, but then I suspect you would need such workaround everywhere, not just git. But we have these options we can use to work around the issue, so there is no strong reason not to reject this patch, either. ] Signed-off-by: Michal Ostrowski <mostrows@watson.ibm.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * clone: do not create remotes/origin nor origin branch in a bare repository.Junio C Hamano2006-01-24
| | | | | | | | | | | | | | It is simply pointless, since no merges will ever happen in such a repository. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * git-clone: PG13 --naked option to --bare.Junio C Hamano2006-01-24
|/ | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* Don't include ../README in git.txt - make a local copyPavel Roskin2006-01-24
| | | | | | | | asciidoc 7.0.4 and newer considers such includes from parent directory unsafe. Signed-off-by: Pavel Roskin <proski@gnu.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation: finishing touches to the new tutorial.Junio C Hamano2006-01-22
| | | | | | | | We forgot to update the primary link from git.html leading to the tutorial, and also forgot to build and install the renamed core-tutorial document. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Recommend to remove unused `origin` in a shared repository.Junio C Hamano2006-01-22
| | | | | | | | | | It is a common mistake to leave an unsed `origin` branch behind if a shared public repository was created by first cloning from somewhere else. Subsequent `git push` into it with the default "push all the matching ref" would push the `origin` branch from the developer repository uselessly. Signed-off-by: Junio C Hamano <junkio@cox.net>
* New tutorialJ. Bruce Fields2006-01-22
| | | | | | | | | | | | | | The current Documentation/tutorial.txt concentrates on the lower-level git interfaces. So it's useful to people developing alternative porcelains, to advanced users, etc., but not so much to beginning users. I think it makes sense for the main tutorial to address those beginnning users, so with this patch I'm proposing that we move Documentation/tutorial.txt to Documentation/core-tutorial.txt and replace it by a new tutorial. Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu> Signed-off-by: Junio C Hamano <junkio@cox.net>
* git-grep: clarification on parameters.Junio C Hamano2006-01-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We forgot to make sure that there is no more than one pattern parameter. Also when looking for files in a directory called '--others', it passed that path limiter without preceding the end-of-options marker '--' to underlying git-ls-files, which misunderstood it as one of its options instead. $ git grep --others -e Meta/Make Meta $ git grep -o -e Meta/Make Meta $ git grep -o Meta/Make Meta look for a string "Meta/Make" from untracked files in Meta/ directory. $ git grep Meta/Make --others looks for the same string from tracked files in ./--others directory. On the other hand, $ git grep -e Meta/Make --others does not have a freestanding pattern, so everybody is parameter and there is no path specifier. It looks for the string in all the untracked files without any path limiter. [jc: updated with usability enhancements and documentation cleanups from Sean.] Signed-off-by: Junio C Hamano <junkio@cox.net>
* Document git-ls-files --directoryPetr Baudis2006-01-21
| | | | | | | Add the appropriate bit of documentation. Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Minor git-reset and git-commit documentation fixesJ. Bruce Fields2006-01-21
| | | | | | | | Minor copyediting of recent additions to git-commit and git-reset documentation. Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu> Signed-off-by: Junio C Hamano <junkio@cox.net>
* AsciiDoc fixes for the git-svnimport manpageFlorian Weimer2006-01-21
| | | | | | | | Change "SVN:: Perl" to "SVN::Perl", wrap a long line, and clean up the description of positional arguments. Signed-off-by: Florian Weimer <fw@deneb.enyo.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* update using-topic-branchesLuck, Tony2006-01-20
| | | | | | | | | Update documentation to warn users not to create noise in then Linux history by creating pointless "Auto-update from upstream" merge commits. Signed-off-by: Tony Luck <tony.luck@intel.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* git-push: fix --tags and document it.Junio C Hamano2006-01-15
| | | | | | | | Previously 'git-push --tags dst', used information from remotes/dst to determine which refs to push; this patch corrects it, and also documents the --tags option. Signed-off-by: Junio C Hamano <junkio@cox.net>
* git-cvsimport: Add -A <author-conv-file> optionAndreas Ericsson2006-01-15
| | | | | | | | | | | | | | | | | | | | | This patch adds the option to specify an author name/email conversion file in the format exon=Andreas Ericsson <ae@op5.se> spawn=Simon Pawn <spawn@frog-pond.org> which will translate the ugly cvs authornames to the more informative git style. The info is saved in $GIT_DIR/cvs-authors, so that subsequent incremental imports will use the same author-info even if no -A option is specified. If an -A option *is* specified, the info in $GIT_DIR/cvs-authors is appended/updated appropriately. Docs updated accordingly. Signed-off-by: Andreas Ericsson <ae@op5.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
*-. Merge branches 'jc/checkout', 'jc/format-patch', 'jc/octopus', 'jc/sb' and ↵Junio C Hamano2006-01-15
|\ \ | | | | | | | | | 'jc/clone'
| | * clone: --naked option.Junio C Hamano2006-01-14
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new option --naked is to help creating a naked repository for public consumption. $ git clone -l -s --naked \ /pub/scm/.../torvalds/linux-2.6.git subproj-2.6.git is equivalent to this sequence: $ git clone -l -s -n /pub/scm/.../torvalds/linux-2.6.git temp $ mv temp/.git subproj-2.6.git $ rmdir temp Signed-off-by: Junio C Hamano <junkio@cox.net>
| * show-branch: --current includes the current branch.Junio C Hamano2006-01-15
| | | | | | | | | | | | | | | | | | | | | | | | | | With this, the command includes the current branch to the list of revs to be shown when it is not given on the command line. This is handy to use in the configuration file like this: [showbranch] default = --current default = heads/* ; primary branches, not topics under ; subdirectories Signed-off-by: Junio C Hamano <junkio@cox.net>
| * show-branch: make the current branch and merge commits stand out.Junio C Hamano2006-01-15
| | | | | | | | | | | | | | | | | | | | | | This changes the character used to mark the commits that is on the branch from '+' to '*' for the current branch, to make it stand out. Also we show '-' for merge commits. When you have a handful branches with relatively long diversion, it is easier to see which one is the current branch this way. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Documentation: show-branch.Junio C Hamano2006-01-15
|/ | | | | | Describe showbranch.default configuration item and give an example. Signed-off-by: Junio C Hamano <junkio@cox.net>
* checkout: merge local modifications while switching branches.Junio C Hamano2006-01-13
| | | | | | | | | | | | | | | | | | | * Instead of going interactive, introduce a command line switch '-m' to allow merging changes when normal two-way merge by read-tree prevents branch switching. * Leave the unmerged stages intact if automerge fails, but reset index entries of cleanly merged paths to that of the new branch, so that "git diff" (not "git diff HEAD") would show the local modifications. * Swap the order of trees in read-tree three-way merge used in the fallback, so that `git diff` to show the conflicts become more natural. * Describe the new option and give more examples in the documentation. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Merge fixes up to GIT 1.1.2Junio C Hamano2006-01-13
|\
| *-. GIT 1.1.2v1.1.2Junio C Hamano2006-01-13
| |\ \
| | | * Documentation: git-reset - interrupted workflow.Junio C Hamano2006-01-13
| | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
| | | * Documentation: git-commit -aJunio C Hamano2006-01-13
| | | | | | | | | | | | | | | | | | | | | | | | A bit more elaboration on what "update all paths" means. Signed-off-by: Junio C Hamano <junkio@cox.net>
| | | * Documentation: clarify fetch parameter descriptions.J. Bruce Fields2006-01-12
| | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | | Add --keep option to keep downloaded packs to git-fetch.Tom Prince2006-01-10
|/ / / | | | | | | | | | | | | Signed-off-by: Tom Prince <tom.prince@ualberta.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | GIT 1.1.1v1.1.1Junio C Hamano2006-01-10
|\ \ \ | |/ / |/| / | |/
| * glossary: explain "master" and "origin"Johannes Schindelin2006-01-10
| | | | | | | | | | | | | | | | | | | | If you are a long time git user/developer, you forget that to a new git user, these words have not the same meaning as to you. [jc: with updates from J. Bruce Fields.] Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | git-daemon --base-pathPetr Baudis2006-01-07
| | | | | | | | | | | | | | | | | | | | Tommi Virtanen expressed a wish on #git to be able to use short and elegant git URLs by making git-daemon 'root' in a given directory. This patch implements this, causing git-daemon to interpret all paths relative to the given base path if any is given. Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | git-fetch: auto-following tags.Junio C Hamano2006-01-07
| | | | | | | | | | | | | | | | | | | | | | I added things to ls-remote so that Cogito can auto-follow tags easily and correctly a while ago, but git-fetch did not use the facility. Recently added git-describe command relies on repository keeping up-to-date set of tags, which made it much more attractive to automatically follow tags, so we do that as well. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Merge fixes up to GIT 1.0.7Junio C Hamano2006-01-05
|\ \ | |/ | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Fix git-symbolic-ref typo in git.txt.Jon Loeliger2006-01-05
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Documentation/git-svnimport: document -T and -t switches correctlyEric Wong2006-01-05
| | | | | | | | | | | | | | | | The -T and -t switches are swapped in the documentation and actual code. I've made the documentation match the code. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Wrap synopsis lines and use [verse] to keep formattingJonas Fonseca2006-01-05
| | | | | | | | | | | | | | In addition, also fixes a few synopses to be more consistent and a gitlink. Signed-off-by: Jonas Fonseca <fonseca@diku.dk> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * trivial: clarify, what are the config's user.name and user.email aboutAlex Riesen2006-01-05
| | | | | | | | | | Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * git-init-db(1): Describe --shared and the idempotent nature of init-dbJonas Fonseca2006-01-05
| | | | | | | | | | | | | | Based on the recent discussion on the mailing list. Signed-off-by: Jonas Fonseca <fonseca@diku.dk> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Documentation: spell.Junio C Hamano2005-12-29
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | git-describe: documentation.Junio C Hamano2005-12-27
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Tutorial: mention shared repository management.Junio C Hamano2005-12-24
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Merge fixes up to GIT 1.0.4Junio C Hamano2005-12-24
|\ \ | |/
| * ls-files --full-name: usage string and documentation.Junio C Hamano2005-12-23
| | | | | | | | | | | | | | Somehow this option was not mentioned anywhere in the documentation nor the usage string. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | rev-parse: --show-cdupJunio C Hamano2005-12-22
| | | | | | | | | | | | | | | | | | | | | | When --show-prefix is useful, sometimes it is easier to cd up to the toplevel of the tree. This is equivalent to: git rev-parse --show-prefix | sed -e 's|[^/][^/]*|..|g' but we do not have to invoke sed for that. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | git-clone: Support changing the origin branch with -oJohannes Schindelin2005-12-22
|/ | | | | | | | | | | | | Earlier, git-clone stored upstream's master in the branch named 'origin', possibly overwriting an existing such branch. Now you can change it by calling git-clone with '-o <other_name>'. [jc: added ref format check, subdirectory safety, documentation and usage string.] Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* A shared repository should be writable by members.Junio C Hamano2005-12-20
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* diff --abbrev: document --abbrev=<n> form.Junio C Hamano2005-12-19
| | | | | | It was implemented there but was not advertised. Signed-off-by: Junio C Hamano <junkio@cox.net>
* diff: --abbrev optionJunio C Hamano2005-12-19
| | | | | | | | | | | When I show transcripts to explain how something works, I often find myself hand-editing the diff-raw output to shorten various object names in the output. This adds --abbrev option to the diff family, which shortens diff-raw output and diff-tree commit id headers. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Remove "octopus".Junio C Hamano2005-12-19
| | | | | | | | | We still advertise "git resolve" as a standalone command, but never "git octopus", so nobody should be using it and it is safe to retire it. The functionality is still available as a strategy backend. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation: stdout of update-hook is connected to /dev/nullJunio C Hamano2005-12-19
| | | | | | Mention that update-hook does not emit its stdout to the sender. Signed-off-by: Junio C Hamano <junkio@cox.net>
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-15 19:12:55 +0000