summaryrefslogtreecommitdiff
path: root/Documentation
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* Merge branch 'pb/configure'Junio C Hamano2006-07-261-7/+7
|\ | | | | | | | | | | * pb/configure: Rename man1 and man7 variables to man1dir and man7dir Allow INSTALL, bindir, mandir to be set in main Makefile
| * Rename man1 and man7 variables to man1dir and man7dirJakub Narebski2006-06-291-5/+5
| | | | | | | | | | | | | | | | | | This patch renames man1 and man7 variables to man1dir and man7dir, according to "Makefile Conventions: Variables for Installation Directories" in make.info of GNU Make. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Allow INSTALL, bindir, mandir to be set in main MakefileJakub Narebski2006-06-291-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Makefiles in subdirectories now use existing value of INSTALL, bindir, mandir if it is set, allowing those to be set in main Makefile or in included config.mak. Main Makefile exports variables which it sets. Accidentally it renames bin to bindir in Documentation/Makefile (should be bindir from start, but is unused, perhaps to be removed). Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Merge branch 'jt/format-patch'Junio C Hamano2006-07-251-1/+15
|\ \ | | | | | | | | | | | | | | | | | | | | | * jt/format-patch: builtin-log: typefix for recent format-patch changes. Add option to set initial In-Reply-To/References Add option to enable threading headers git-format-patch: Make the second and subsequent mails replies to the first
| * | Add option to set initial In-Reply-To/ReferencesJosh Triplett2006-07-141-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | Add the --in-reply-to option to provide a Message-Id for an initial In-Reply-To/References header, useful for including a new patch series as part of an existing thread. Signed-off-by: Josh Triplett <josh@freedesktop.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | Add option to enable threading headersJosh Triplett2006-07-141-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | Add a --thread option to enable generation of In-Reply-To and References headers, used to make the second and subsequent mails appear as replies to the first. Signed-off-by: Josh Triplett <josh@freedesktop.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Merge branch 'lt/objformat'Junio C Hamano2006-07-241-0/+6
|\ \ \ | | | | | | | | | | | | | | | | * lt/objformat: sha1_file: add the ability to parse objects in "pack file format"
| * | | sha1_file: add the ability to parse objects in "pack file format"Linus Torvalds2006-07-131-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The pack-file format is slightly different from the traditional git object format, in that it has a much denser binary header encoding. The traditional format uses an ASCII string with type and length information, which is somewhat wasteful. A new object format starts with uncompressed binary header followed by compressed payload -- this will allow us later to copy the payload straight to packfiles. Obviously they cannot be read by older versions of git, so for now new object files are created with the traditional format. core.legacyheaders configuration item, when set to false makes the code write in new format for people to experiment with. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | | pack-objects: check pack.window for default window sizeJeff King2006-07-231-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For some repositories, deltas simply don't make sense. One can disable them for git-repack by adding --window, but git-push insists on making the deltas which can be very CPU-intensive for little benefit. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | | tar-tree: add the "tar.umask" config optionWilly Tarreau2006-07-232-1/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By default, git-tar-tree(1) sets file and directories modes to 0666 or 0777. While this is both useful and acceptable for projects such as the Linux Kernel, it might be excessive for other projects. With this variable, it becomes possible to tell git-tar-tree(1) to apply a specific umask to the modes above. The special value "user" indicates that the user's current umask will be used. This should be enough for most projects, as it will lead to the same permissions as git-checkout(1) would use. The default value remains 0, which means world read-write. Signed-off-by: Willy Tarreau <w@1wt.eu> Acked-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | | cvsexportcommit - add -a (add author line) flag, cleanup warningsMartin Langhoff2006-07-231-2/+6
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds support for -a which will add an "Author: " line, and possibly a "Committer: " line to the bottom of the commit message for CVS. The commit message parser is now a little bit better, and some warnings have been cleaned up. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Documentation/urls.txt: Use substitution to escape square bracketsJonas Fonseca2006-07-142-8/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changes "[user@]" to use {startsb} and {endsb} to insert [ and ], similar to how {caret} is used in git-rev-parse.txt. [jc: Removed a well-intentioned comment that broke the final formatting from the original patch. While we are at it, updated the paragraph that claims to be equivalent to the section that was updated earlier without making matching changes.] Signed-off-by: Jonas Fonseca <fonseca@diku.dk> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Documentation/Makefile: product depends on asciidoc.confJunio C Hamano2006-07-141-0/+1
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | documentation (urls.txt) typofixAlp Toker2006-07-141-1/+1
|/ /
* | Documentation about exclude/ignore filesMatthias Lederhofer2006-07-132-5/+7
| | | | | | | | | | | | | | | | | | Use .git/info/exclude in the example in git-ls-files.txt, instead of .git/ignore, and update the list of commands looking at .git/info/exclude in repository-layout.txt. Signed-off-by: Matthias Lederhofer <matled@gmx.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Documentation: Fix ssh://[user@]host.xz URLJunio C Hamano2006-07-131-3/+3
| | | | | | | | | | | | | | | | | | Earlier commit c3f17061 broke asciidoc markup. Noticed by Alp Toker with a fix, but fixed up in a way with smaller formatting impact. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Merge branch 'ml/trace'Junio C Hamano2006-07-121-0/+7
|\ \ | | | | | | | | | | | | | | | | | | * ml/trace: test-lib: unset GIT_TRACE GIT_TRACE: fix a mixed declarations and code warning GIT_TRACE: show which built-in/external commands are executed
| * | GIT_TRACE: show which built-in/external commands are executedMatthias Lederhofer2006-07-091-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With the environment variable GIT_TRACE set git will show - alias expansion - built-in command execution - external command execution on stderr. Signed-off-by: Matthias Lederhofer <matled@gmx.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | typofix (git-name-rev documentation)Alp Toker2006-07-111-1/+1
| | | | | | | | | | | | | | | Signed-off-by: Alp Toker <alp@atoker.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Mention the [user@] part in documentation of ssh:// urls.Yakov Lerner2006-07-111-3/+3
| | | | | | | | | | | | | | | Signed-off-by: Yakov Lerner <iler.ml@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | git-rev-list: add documentation for --parents, --no-mergesMatthias Lederhofer2006-07-101-0/+6
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Fix more typos, primarily in the codePavel Roskin2006-07-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | The only visible change is that git-blame doesn't understand "--compability" anymore, but it does accept "--compatibility" instead, which is already documented. Signed-off-by: Pavel Roskin <proski@gnu.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Merge branch 'ew/diff'Junio C Hamano2006-07-092-4/+43
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ew/diff: templates/hooks--update: replace diffstat calls with git diff --stat diff: do not use configuration magic at the core-level Update diff-options and config documentation. diff.c: --no-color to defeat diff.color configuration. diff.c: respect diff.renames config option
| * | | Update diff-options and config documentation.Junio C Hamano2006-07-072-4/+38
| | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | | diff.c: respect diff.renames config optionEric Wong2006-07-071-0/+5
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | diff.renames is mentioned several times in the documentation, but to my surprise it didn't do anything before this patch. Also add the --no-renames option to override this from the command-line. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Merge branch 'ew/svn'Junio C Hamano2006-07-091-0/+319
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ew/svn: Fix some doubled word typos Typofix in Makefile comment. Makefile: export NO_SVN_TESTS git-svn: migrate out of contrib (follow-up) git-svn: migrate out of contrib
| * | | Fix some doubled word typosAlp Toker2006-07-091-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Alp Toker <alp@atoker.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | | git-svn: migrate out of contribEric Wong2006-07-061-0/+319
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow NO_SVN_TESTS to be defined to skip git-svn tests. These tests are time-consuming due to SVN being slow, and even more so if SVN Perl libraries are not available. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | | Fix typos involving the word 'commit'Alp Toker2006-07-091-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Alp Toker <alp@atoker.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | | Fix some doubled word typosAlp Toker2006-07-091-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Alp Toker <alp@atoker.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | | change ent to tree in git-diff documentationMatthias Lederhofer2006-07-092-10/+10
| | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | | Assorted typo fixesPavel Roskin2006-07-0917-22/+22
| |/ / |/| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | diff-options: Explain --text and -aStephan Feder2006-07-071-0/+6
| | | | | | | | | | | | | | | Signed-off-by: Stephan Feder <sf@b-i-t.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | rev-parse documentation: talk about range notation.Junio C Hamano2006-07-061-8/+37
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | show-branch: match documentation and usageJunio C Hamano2006-07-061-0/+5
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Merge branch 'js/merge-base'Junio C Hamano2006-07-061-0/+14
|\ \ \ | |/ / |/| |
| * | Merge branch 'master' into js/merge-baseJunio C Hamano2006-07-031-3/+3
| |\ \ | | | | | | | | | | | | This is to pull in the object-hash clean-up from the master branch.
| * | | Add '...' operator for revisionsRene Scharfe2006-07-011-0/+14
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'A...B' is a shortcut for 'A B --not $(git-merge-base --all A B)'. This XOR-like operation is called symmetric difference in set theory. The symbol '...' has been chosen because it's rather similar to the existing '..' operator and the somewhat more natural caret ('^') is already taken. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Merge branch 'ew/instaweb'Junio C Hamano2006-07-061-0/+84
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ew/instaweb: instaweb: fix unportable ';' usage in sed Makefile: replace ugly and unportable sed invocation Add git-instaweb, instantly browse the working repo with gitweb gitweb: Declare global variables with "our" gitweb: Enable tree (directory) history display gitweb: optimize per-file history generation
| * | | Add git-instaweb, instantly browse the working repo with gitwebEric Wong2006-07-011-0/+84
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I got tired of having to configure gitweb for every repository I work on. I sometimes prefer gitweb to standard GUIs like gitk or gitview; so this lets me automatically configure gitweb to browse my working repository and also opens my browser to it. Updates from the original patch: Added Apache/mod_perl2 compatibility if Dennis Stosberg's gitweb has been applied, too: <20060621130708.Gcbc6e5c@leonov.stosberg.net> General cleanups in shell code usage. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | core.compression documentation formatting fix.Joachim Berdal Haga2006-07-061-1/+1
| | | | | | | | | | | | | | | | | | | | | I didn't notice earlier that two colons are required for the asciidoc entry. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Make zlib compression level configurable, and change default.Joachim B Haga2006-07-031-0/+6
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With the change in default, "git add ." on kernel dir is about twice as fast as before, with only minimal (0.5%) change in object size. The speed difference is even more noticeable when committing large files, which is now up to 8 times faster. The configurability is through setting core.compression = [-1..9] which maps to the zlib constants; -1 is the default, 0 is no compression, and 1..9 are various speed/size tradeoffs, 9 being slowest. Signed-off-by: Joachim B Haga (cjhaga@fys.uio.no) Acked-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Minor documentation fixup.Robin Rosenberg2006-07-011-3/+3
|/ | | | | Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Merge branch 'jc/squash'Junio C Hamano2006-06-261-0/+8
|\ | | | | | | | | * jc/squash: git-merge --squash
| * git-merge --squashJunio C Hamano2006-06-241-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some people tend to do many little commits on a topic branch, recording all the trials and errors, and when the topic is reasonably cooked well, would want to record the net effect of the series as one commit on top of the mainline, removing the cruft from the history. The topic is then abandoned or forked off again from that point at the mainline. The barebone porcelainish that comes with core git tools does not officially support such operation, but you can fake it by using "git pull --no-merge" when such a topic branch is not a strict superset of the mainline, like this: git checkout mainline git pull --no-commit . that-topic-branch : fix conflicts if any rm -f .git/MERGE_HEAD git commit -a -m 'consolidated commit log message' git branch -f that-topic-branch ;# now fully merged This however does not work when the topic branch is a fast forward of the mainline, because normal "git pull" will never create a merge commit in such a case, and there is nothing special --no-commit could do to begin with. This patch introduces a new option, --squash, to support such a workflow officially in both fast-forward case and true merge case. The user-level operation would be the same in both cases: git checkout mainline git pull --squash . that-topic-branch : fix conflicts if any -- naturally, there would be : no conflict if fast forward. git commit -a -m 'consolidated commit log message' git branch -f that-topic-branch ;# now fully merged When the current branch is already up-to-date with respect to the other branch, there truly is nothing to do, so the new option does not have any effect. This was brought up in #git IRC channel recently. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Merge branch 'ew/rebase'Junio C Hamano2006-06-261-1/+0
|\ \ | | | | | | | | | | | | | | | | | | * ew/rebase: rebase: allow --skip to work with --merge rebase: cleanup rebasing with --merge rebase: allow --merge option to handle patches merged upstream
| * | rebase: allow --skip to work with --mergeEric Wong2006-06-251-1/+0
| |/ | | | | | | | | | | | | | | | | | | Now that we control the merge base selection, we won't be forced into rolling things in that we wanted to skip beforehand. Also, add a test to ensure this all works as intended. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | correct documentation for git grepMatthias Lederhofer2006-06-251-1/+6
|/ | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* Merge branch 'ew/rebase'Junio C Hamano2006-06-221-1/+19
|\ | | | | | | | | | | | | | | * ew/rebase: rebase --merge: fix for rebasing more than 7 commits. rebase: error out for NO_PYTHON if they use recursive merge Add renaming-rebase test. rebase: Allow merge strategies to be used when rebasing
View Lorry Controller Status