summaryrefslogtreecommitdiff
path: root/Documentation
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'jc/daemon'Junio C Hamano2006-09-071-8/+33
|\ | | | | | | | | | | | | * jc/daemon: Revert "daemon: add upload-tar service." multi-service daemon: documentation daemon: add upload-tar service.
| * Revert "daemon: add upload-tar service."Junio C Hamano2006-09-071-6/+0
| | | | | | | | | | | | | | | | | | | | This reverts parts of commit 74c0cc2 and part of commit 355f541. Franck and Rene are working on a unified upload-archive which would supersede this when done, so better not to get in their way. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * multi-service daemon: documentationJunio C Hamano2006-08-271-8/+39
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Teach rev-list an option to read revs from the standard input.Junio C Hamano2006-09-051-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | When --stdin option is given, in addition to the <rev>s listed on the command line, the command can read one rev parameter per line from the standard input. The list of revs ends at the first empty line or EOF. Note that you still have to give all the flags from the command line; only rev arguments (including A..B, A...B, and A^@ notations) can be give from the standard input. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Update GIT_TRACE documentation.Christian Couder2006-09-031-1/+10
| | | | | | | | | | Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Documentation: Fix howto/revert-branch-rebase.html generationSergey Vlasov2006-09-011-1/+1
| | | | | | | | | | | | | | | | | | The rule for howto/*.html used "$?", which expands to the list of all newer prerequisites, including asciidoc.conf added by another rule. "$<" should be used instead. Signed-off-by: Sergey Vlasov <vsu@altlinux.ru> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | git-rev-list(1): group options; reformat; document more optionsJonas Fonseca2006-09-011-66/+188
| | | | | | | | | | Signed-off-by: Jonas Fonseca <fonseca@diku.dk> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Include config.mak.autogen in the doc MakefileJonas Fonseca2006-08-311-0/+2
| | | | | | | | | | | | | | | | ... to install documentation relative to the path set with configure's --prefix option. Signed-off-by: Jonas Fonseca <fonseca@diku.dk> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | git(7): move gitk(1) to the list of porcelain commandsJonas Fonseca2006-08-311-7/+3
| | | | | | | | | | Signed-off-by: Jonas Fonseca <fonseca@diku.dk> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Add --relative-date option to the revision interfaceJonas Fonseca2006-08-281-0/+5
|/ | | | | | | Exposes the infrastructure from 9a8e35e98793af086f05d1ca9643052df9b44a74. Signed-off-by: Jonas Fonseca <fonseca@diku.dk> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Merge branch 'ts/daemon'Junio C Hamano2006-08-271-1/+13
|\ | | | | | | | | * ts/daemon: Added support for dropping privileges to git-daemon.
| * Added support for dropping privileges to git-daemon.Tilman Sauerbeck2006-08-221-1/+13
| | | | | | | | | | Signed-off-by: Tilman Sauerbeck <tilman@code-monkey.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Merge branch 'jc/apply'Junio C Hamano2006-08-271-2/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * jc/apply: git-apply --reject: finishing touches. apply --reject: count hunks starting from 1, not 0 git-apply --verbose git-apply --reject: send rejects to .rej files. git-apply --reject apply --reverse: tie it all together. diff.c: make binary patch reversible. builtin-apply --reverse: two bugfixes.
| * | git-apply --reject: finishing touches.Junio C Hamano2006-08-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After a failed "git am" attempt: git apply --reject --verbose .dotest/patch applies hunks that are applicable and leaves *.rej files the rejected hunks, and it reports what it is doing. With --index, files with a rejected hunk do not get their index entries updated at all, so "git diff" will show the hunks that successfully got applied. Without --verbose to remind the user that the patch updated some other paths cleanly, it is very easy to lose track of the status of the working tree, so --reject implies --verbose. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | git-apply --rejectJunio C Hamano2006-08-171-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | With the new flag "--reject", hunks that do not apply are sent to the standard output, and the usable hunks are applied. The command itself exits with non-zero status when this happens, so that the user or wrapper can take notice and sort the remaining mess out. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | apply --reverse: tie it all together.Junio C Hamano2006-08-161-1/+5
| |/ | | | | | | | | | | Add a few tests, usage string, and documentation. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Add git-zip-treeRene Scharfe2006-08-261-0/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the Windows world ZIP files are better supported than tar files. Windows even includes built-in support for ZIP files nowadays. git-zip-tree is similar to git-tar-tree; it creates ZIP files out of git trees. It stores the commit ID (if available) in a ZIP file comment which can be extracted by unzip. There's still quite some room for improvement: this initial version supports no symlinks, calls write() way too often (three times per file) and there is no unit test. [jc: with a minor typefix to avoid void* arithmetic] Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | git-svn: add the 'dcommit' commandEric Wong2006-08-261-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a high-level wrapper around the 'commit-diff' command and used to produce cleaner history against the mirrored repository through rebase/reset usage. It's basically a more polished version of this: for i in `git rev-list --no-merges remotes/git-svn..HEAD | tac`; do git-svn commit-diff $i~1 $i done git reset --hard remotes/git-svn Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | git-svn: recommend rebase for syncing against an SVN repoEric Wong2006-08-251-2/+20
| | | | | | | | | | | | | | | | | | | | Does this make sense to other git-svn users out there? pull can give funky history unless you understand how git-svn works internally, which users should not be expected to do. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | git-svn(1): improve asciidoc markupJonas Fonseca2006-08-251-85/+114
| | | | | | | | | | | | | | | | | | | | | | | | Use list continuation to have better wrapping. This accounts for most of the changes because it reindents a lot of text without applying other changes. Use cross-referencing for interlinking and the gitlink macro for pointing to other tools in the git suite. Signed-off-by: Jonas Fonseca <fonseca@diku.dk> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | git(7): put the synopsis in a verse style paragraphJonas Fonseca2006-08-251-1/+2
| | | | | | | | | | | | | | ... so it wraps properly in small terminals. Signed-off-by: Jonas Fonseca <fonseca@diku.dk> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | gitk(1): expand the manpage to look less like a templateJonas Fonseca2006-08-251-10/+50
| | | | | | | | | | | | | | | | | | Add a short description and document a few selected options additionally to the different "entities" in the standard calling convention. Advertise other git repository browsers. Lastly, climb Mount Ego. Signed-off-by: Jonas Fonseca <fonseca@diku.dk> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | git-blame(1): mention options in the synopsis and advertise pickaxeJonas Fonseca2006-08-251-6/+23
| | | | | | | | | | | | | | | | | | | | Inspired by the cvs annotate documentation improve and expand the man page to also mention the limitations of file annotations. Since people coming from the SVN/CVS world might first look here, also briefly advertise how the pickaxe interface makes it easy to go beyond these limitation. Signed-off-by: Jonas Fonseca <fonseca@diku.dk> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | git-ls-remote(1): document --upload-packJonas Fonseca2006-08-251-4/+14
| | | | | | | | | | | | | | ... and mention that '.' will list the local repo references. Signed-off-by: Jonas Fonseca <fonseca@diku.dk> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | git-apply(1): document missing options and improve existing onesJonas Fonseca2006-08-251-7/+39
| | | | | | | | | | Signed-off-by: Jonas Fonseca <fonseca@diku.dk> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | update-index -gJunio C Hamano2006-08-231-2/+2
|/ | | | | | | I often find myself typing this but the common abbreviation "g" for "again" has not been supported so far for some unknown reason. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation/technical/racy-git.txtJunio C Hamano2006-08-151-0/+193
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* Merge branch 'js/color-diff'Junio C Hamano2006-08-121-0/+3
|\
| * Add the --color-words option to the diff options familyJohannes Schindelin2006-08-101-0/+3
| | | | | | | | | | | | | | | | | | With this option, the changed words are shown inline. For example, if a file containing "This is foo" is changed to "This is bar", the diff will now show "This is " in plain text, "foo" in red, and "bar" in green. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Merge branch 'jc/grep'Junio C Hamano2006-08-121-1/+7
|\ \
| * | git-grep: show pathnames relative to the current directoryJunio C Hamano2006-08-111-1/+7
| |/ | | | | | | | | | | | | | | | | | | | | By default, the command shows pathnames relative to the current directory. Use --full-name (the same flag to do so in ls-files) if you want to see the full pathname relative to the project root. This makes it very pleasant to run in Emacs compilation (or "grep-find") buffer. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Merge branch 'ml/pager'Junio C Hamano2006-08-121-0/+3
|\ \ | |/ |/|
| * pager: environment variable GIT_PAGER to override PAGERMatthias Lederhofer2006-07-311-0/+3
| | | | | | | | | | Signed-off-by: Matthias Lederhofer <matled@gmx.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Add Documentation/howto/setup-git-server-over-http.txtRutger Nijlunsing2006-08-101-0/+256
| | | | | | | | | | | | | | | | | | | | | | A small howto on how to setup GIT over HTTP transport protocol by setting up WebDAV access on apache2. [jc: minimum ispell fixes applied] Signed-off-by: Rutger Nijlunsing <git@tux.tmfweb.nl> Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Fix tutorial-2.htmlJunio C Hamano2006-08-091-0/+1
| | | | | | | | | | | | Honza Pazdziora noticed that one example did not match reality. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Documentation: git-status takes the same options as git-commitJunio C Hamano2006-08-081-1/+5
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Update git-init-db(1) and documentation of core.sharedRepositoryJonas Fonseca2006-08-082-19/+41
| | | | | | | | | | | | | | | | Combine option descriptions in git-init-db(1). Reflect the changes to additionally allow all users to read the created git repository. Signed-off-by: Jonas Fonseca <fonseca@diku.dk> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Document rev-list's option --mergeUwe Zeisberger2006-08-041-0/+5
| | | | | | | | | | Signed-off-by: Uwe Zeisberger <Uwe_Zeisberger@digi.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Documentation/git.txt: link git-svn and git-instaweb from the main page.Junio C Hamano2006-08-031-0/+6
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | git-grep: document --and, --or, --not, ( and )Matthias Lederhofer2006-08-021-3/+17
| | | | | | | | | | | | | | [jc: added an example section.] Signed-off-by: Matthias Lederhofer <matled@gmx.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Documentation: convert uses of git-link macro to gitlinkJeff King2006-08-022-4/+4
| | | | | | | | | | | | | | There isn't and never was such a macro; all uses are typos. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | git-push: allow -f as an alias for --forceJeff King2006-08-021-1/+1
|/ | | | | | | | | This was already documented in the options section of the manpage. This patch implements it, adds it to the usage message, and mentions it at the top of the manpage. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* pager: config variable pager.colorMatthias Lederhofer2006-07-311-0/+4
| | | | | | | enable/disable colored output when the pager is in use Signed-off-by: Matthias Lederhofer <matled@gmx.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* tar-tree: illustrate an obscure feature betterJohannes Schindelin2006-07-301-0/+5
| | | | | | | | Since you can tar just a subdirectory of a certain revision, tell the users so, by showing an example how to do it. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Merge branch 'pb/multi-fetch'Junio C Hamano2006-07-282-1/+13
|\ | | | | | | | | | | | | | | * pb/multi-fetch: Teach git-http-fetch the --stdin switch Teach git-local-fetch the --stdin switch Make pull() support fetching multiple targets at once Make pull() take some implicit data as explicit arguments
| * Teach git-http-fetch the --stdin switchPetr Baudis2006-07-271-1/+7
| | | | | | | | | | | | | | Speeds up things quite a lot when fetching tags with Cogito. Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Teach git-local-fetch the --stdin switchPetr Baudis2006-07-271-0/+6
| | | | | | | | | | | | | | | | This makes it possible to fetch many commits (refs) at once, greatly speeding up cg-clone. Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Merge branch 'js/alias-p'Junio C Hamano2006-07-281-1/+11
|\ \ | |/ |/| | | | | | | * js/alias-p: git wrapper: add --git-dir=<path> and --bare options Allow an alias to start with "-p"
| * git wrapper: add --git-dir=<path> and --bare optionsJohannes Schindelin2006-07-251-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With this, you can say git --bare repack -a -d inside a bare repository, and it will actually work. While at it, also move the --version, --help and --exec-path options to the handle_options() function. While at documenting the new options, also document the --paginate option. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | daemon: documentation for --reuseaddr, --detach and --pid-fileMatthias Lederhofer2006-07-271-1/+12
| | | | | | | | | | Signed-off-by: Matthias Lederhofer <matled@gmx.net> Signed-off-by: Junio C Hamano <junkio@cox.net>