path: root/Documentation
AgeCommit message (Collapse)Author
2008-03-16Update draft release notes for 1.5.5v1.5.5-rc0Junio C Hamano
Signed-off-by: Junio C Hamano <>
2008-03-16Merge branch 'maint'Junio C Hamano
* maint: Start draft ReleaseNotes for rebase -m: do not trigger pre-commit verification Conflicts: RelNotes
2008-03-16Start draft ReleaseNotes for C Hamano
Signed-off-by: Junio C Hamano <>
2008-03-15Merge branch 'py/submodule'Junio C Hamano
* py/submodule: git-submodule summary: fix that some "wc" flavors produce leading spaces git-submodule summary: test git-submodule summary: documentation git-submodule summary: limit summary size git-submodule summary: show commit summary git-submodule summary: code framework
2008-03-15Merge branch 'cc/help'Junio C Hamano
* cc/help: Documentation/git-help: typofix help: warn if specified 'man.viewer' is unsupported, instead of erroring out Documentation: help: explain 'man.viewer' multiple values help: implement multi-valued "man.viewer" config option Documentation: help: describe 'man.viewer' config variable help: add "man.viewer" config var to use "woman" or "konqueror"
2008-03-15Merge branch 'maint'Junio C Hamano
* maint: Make man page building quiet when DOCBOOK_XSL_172 is defined git-new-workdir: Share SVN meta data between work dirs and the repository rev-parse: fix meaning of rev~ vs rev~0. git-svn: don't blindly append '*' to branch/tags config
2008-03-15Make man page building quiet when DOCBOOK_XSL_172 is definedJonas Fonseca
Tell xmlto to repress printing of the lines: Note: meta date : No date. Using generated date git-xyx Note: Writing git-xyz.1 Signed-off-by: Jonas Fonseca <> Signed-off-by: Junio C Hamano <>
2008-03-14Documention: web--browse: add info about "browser.<tool>.cmd" config varChristian Couder
Signed-off-by: Christian Couder <> Signed-off-by: Junio C Hamano <>
2008-03-14Merge branch 'maint'Junio C Hamano
* maint: merge-file: handle empty files gracefully merge-recursive: handle file mode changes Minor wording changes in the keyboard descriptions in git-add --interactive. git fetch: Take '-n' to mean '--no-tags' quiltimport: fix misquoting of parsed -p<num> parameter git-quiltimport: better parser to grok "enhanced" series files.
2008-03-14Minor wording changes in the keyboard descriptions in git-add --interactive.Vineet Kumar
The wording of the interactive help text from git-add--interactive.perl is clearer. Just duplicate that text here. Signed-off-by: Vineet Kumar <> Signed-off-by: Junio C Hamano <>
2008-03-14Documentation/git-help: typofixJunio C Hamano
Noticed by Xavier Maillard Signed-off-by: Junio C Hamano <>
2008-03-13gc: call "prune --expire 2.weeks.ago" by defaultJohannes Schindelin
The only reason we did not call "prune" in git-gc was that it is an inherently dangerous operation: if there is a commit going on, you will prune loose objects that were just created, and are, in fact, needed by the commit object just about to be created. Since it is dangerous, we told users so. That led to many users not even daring to run it when it was actually safe. Besides, they are users, and should not have to remember such details as when to call git-gc with --prune, or to call git-prune directly. Of course, the consequence was that "git gc --auto" gets triggered much more often than we would like, since unreferenced loose objects (such as left-overs from a rebase or a reset --hard) were never pruned. Alas, git-prune recently learnt the option --expire <minimum-age>, which makes it a much safer operation. This allows us to call prune from git-gc, with a grace period of 2 weeks for the unreferenced loose objects (this value was determined in a discussion on the git list as a safe one). If you want to override this grace period, just set the config variable gc.pruneExpire to a different value; an example would be [gc] pruneExpire = 6.months.ago or even "never", if you feel really paranoid. Note that this new behaviour makes "--prune" be a no-op. While adding a test to (since it really tests the implicit call to "prune"), also the original test for "prune --expire" was moved there from, where it did not belong. Signed-off-by: Johannes Schindelin <>
2008-03-13Documentation/config: typofixJunio C Hamano
Each heading of enumerated list should end with double-colon, not single. Signed-off-by: Junio C Hamano <>
2008-03-13Documentation: help: explain 'man.viewer' multiple valuesChristian Couder
Also add titles to paragraphs under "CONFIGURATION VARIABLES". Signed-off-by: Christian Couder <> Signed-off-by: Junio C Hamano <>
2008-03-12git-submodule summary: documentationPing Yin
Signed-off-by: Ping Yin <> Signed-off-by: Junio C Hamano <>
2008-03-12Documentation: help: describe 'man.viewer' config variableChristian Couder
Signed-off-by: Christian Couder <> Tested-by: Xavier Maillard <> Signed-off-by: Junio C Hamano <>
2008-03-11Merge branch 'maint'Junio C Hamano
* maint: git-pull documentation: warn about the option order
2008-03-11update 'git rebase' documentationSZEDER Gábor
Being in the project's top directory when starting or continuing a rebase is not necessary since 533b703 (Allow whole-tree operations to be started from a subdirectory, 2007-01-12). Signed-off-by: SZEDER Gábor <> Signed-off-by: Junio C Hamano <>
2008-03-10git-pull documentation: warn about the option orderJunio C Hamano
We might eventually be loosening this rule, but there is a longstanding restriction that the users currently need to be aware of. Signed-off-by: Junio C Hamano <>
2008-03-09Merge branch 'ph/parseopt'Junio C Hamano
* ph/parseopt: parse-options: new option type to treat an option-like parameter as an argument. parse-opt: bring PARSE_OPT_HIDDEN and NONEG to git-rev-parse --parseopt
2008-03-09Merge branch 'ml/submodule-add-existing'Junio C Hamano
* ml/submodule-add-existing: git-submodule - Allow adding a submodule in-place
2008-03-09Merge branch 'sp/fetch-optim'Junio C Hamano
* sp/fetch-optim: Teach git-fetch to exploit server side automatic tag following Teach fetch-pack/upload-pack about --include-tag git-pack-objects: Automatically pack annotated tags if object was packed Teach git-fetch to grab a tag at the same time as a commit Make git-fetch follow tags we already have objects for sooner Teach upload-pack to log the received need lines to an fd Free the path_lists used to find non-local tags in git-fetch Allow builtin-fetch's find_non_local_tags to append onto a list Ensure tail pointer gets setup correctly when we fetch HEAD only Remove unnecessary delaying of free_refs(ref_map) in builtin-fetch Remove unused variable in builtin-fetch find_non_local_tags
2008-03-09Merge branch 'jc/am'Junio C Hamano
* jc/am: am: --rebasing am: remove support for -d .dotest am: read from the right mailbox when started from a subdirectory
2008-03-09Merge branch 'maint' to sync with C Hamano
* maint: GIT ident.c: reword error message when the user name cannot be determined Fix dcommit, rebase when rewriteRoot is in use Really make the LF after reset in fast-import optional
2008-03-09GIT C Hamano
Signed-off-by: Junio C Hamano <>
2008-03-08merge-tool documentation: describe custom command usageCharles Bailey
The configuration variables for custom merge tools were documented only in config.txt but there was no reference to the functionality in git-mergetool.txt. Signed-off-by: Charles Bailey <> Signed-off-by: Junio C Hamano <>
2008-03-08git-mergetool documentaiton: show toolnames in typewriter fontCharles Bailey
Signed-off-by: Charles Bailey <> Signed-off-by: Junio C Hamano <>
2008-03-08Merge branch 'maint'Junio C Hamano
* maint: unquote_c_style: fix off-by-one. test-lib: fix TERM to dumb for test repeatability config.txt: refer to --upload-pack and --receive-pack instead of --exec git-gui: Gracefully fall back to if msgfmt --tcl fails
2008-03-08Merge branch 'js/reflog-delete'Junio C Hamano
* js/reflog-delete: Add tests for new stash commands drop and pop git-reflog.txt: Document new commands --updateref and --rewrite Add missing '&&' to body of testcase git-stash: add new 'pop' subcommand git-stash: add new 'drop' subcommand git-reflog: add option --updateref to write the last reflog sha1 into the ref refs.c: make close_ref() and commit_ref() non-static git-reflog: add option --rewrite to update reflog entries while expiring reflog-delete: parse standard reflog options builtin-reflog.c: fix typo that accesses an unset variable Teach "git reflog" a subcommand to delete single entries
2008-03-08Merge branch 'dc/format-pretty'Junio C Hamano
* dc/format-pretty: log/show/whatchanged: introduce format.pretty configuration specify explicit "--pretty=medium" with `git log/show/whatchanged` whatchanged documentation: share description of --pretty with others
2008-03-08Merge branch 'cb/mergetool'Junio C Hamano
* cb/mergetool: Add a very basic test script for git mergetool Teach git mergetool to use custom commands defined at config time Changed an internal variable of mergetool to support custom commands Tidy up git mergetool's backup file behaviour
2008-03-07config.txt: refer to --upload-pack and --receive-pack instead of --execUwe Kleine-König
The options --upload-pack (of git-fetch-pack) and --receive-pack (of git-push) do the same as --exec (for both commands). But the former options have the more descriptive name. Signed-off-by: Uwe Kleine-König <> Signed-off-by: Junio C Hamano <>
2008-03-05git-submodule - Allow adding a submodule in-placeMark Levedahl
When working in the top-level project, it is useful to create a new submodule as a git repo in a subdirectory, then add that submodule to the top-level in place. This patch allows "git submodule add <intended url> subdir" to add the existing subdir to the current project. The presumption is the user will later push / clone the subdir to the <intended url> so that future submodule init / updates will work. Absent this patch, "git submodule add" insists upon cloning the subdir from a repository at the given url, which is fine for adding an existing project in, but less useful when adding a new submodule from scratch to an existing project. The former functionality remains, and the clone is attempted if the subdir does not already exist as a valid git repo. Signed-off-by: Mark Levedahl <> Signed-off-by: Junio C Hamano <>
2008-03-05run-command: Redirect stderr to a pipe before redirecting stdout to stderrChristian Couder
With this patch, in the 'start_command' function after forking we now take care of stderr in the child process before stdout. This way if 'start_command' is called with a 'child_process' argument like this: .err = -1; .stdout_to_stderr = 1; then stderr will be redirected to a pipe before stdout is redirected to stderr. So we can now get the process' stdout from the pipe (as well as its stderr). Earlier such a call would have redirected stdout to stderr before stderr was itself redirected, and therefore stdout would not have followed stderr, which would not have been very useful anyway. Update documentation in 'api-run-command.txt' accordingly. Signed-off-by: Christian Couder <> Acked-by: Johannes Sixt <> Signed-off-by: Junio C Hamano <>
2008-03-05Teach git mergetool to use custom commands defined at config timeCharles Bailey
Currently git mergetool is restricted to a set of commands defined in the script. You can subvert the mergetool.<tool>.path to force git mergetool to use a different command, but if you have a command whose invocation syntax does not match one of the current tools then you would have to write a wrapper script for it. This patch adds two git config variable patterns which allow a more flexible choice of merge tool. If you run git mergetool with -t/--tool or the merge.tool config variable set to an unrecognized tool then git mergetool will query the mergetool.<tool>.cmd config variable. If this variable exists, then git mergetool will treat the specified tool as a custom command and will use a shell eval to run the command with the documented shell variables set. mergetool.<tool>.trustExitCode can be used to indicate that the exit code of the custom command can be used to determine the success of the merge. Signed-off-by: Charles Bailey <> Signed-off-by: Junio C Hamano <>
2008-03-05Tidy up git mergetool's backup file behaviourCharles Bailey
Currently a backup pre-merge file with conflict markers is sometimes kept with a .orig extenstion and sometimes removed depending on the particular merge tool used. This patch makes the handling consistent across all merge tools and configurable via a new mergetool.keepBackup config variable Signed-off-by: Charles Bailey <> Signed-off-by: Junio C Hamano <>
2008-03-05log/show/whatchanged: introduce format.pretty configurationDenis Cheng
When running log/show/whatchanged from the command line, the user may want to use a preferred format without having to pass --pretty=<fmt> option every time from the command line. This teaches these three commands to honor a new configuration variable, format.pretty. The --pretty option given from the command line will override the configured format. The earlier patch fixed the in-tree callers that run these commands for purposes other than showing the output directly to the end user (the only other in-tree caller is "git bisect visualize", whose output directly goes to the end user and should be affected by this patch). Similar fixes will be needed for end-user scripts that parse the output from these commands and expect them to be in the default pretty format. Signed-off-by: Denis Cheng <> Signed-off-by: Junio C Hamano <>
2008-03-05whatchanged documentation: share description of --pretty with othersDenis Cheng
The documentation had its own description for --pretty and did not include pretty-options/formats as documentation for other commands in the "log" family did. Signed-off-by: Denis Cheng <> Signed-off-by: Junio C Hamano <>
2008-03-05am: remove support for -d .dotestJunio C Hamano
It has been supported for a long time, but I do not think this feature has been in use in the real world at all. We would eventually move this out of the toplevel of the work tree and to somewhere under $GIT_DIR, so let's remove the command line option to specify the location now. Signed-off-by: Junio C Hamano <>
2008-03-05Teach fetch-pack/upload-pack about --include-tagShawn O. Pearce
The new protocol extension "include-tag" allows the client side of the connection (fetch-pack) to request that the server side of the native git protocol (upload-pack / pack-objects) use --include-tag as it prepares the packfile, thus ensuring that an annotated tag object will be included in the resulting packfile if the object it refers to was also included into the packfile. Signed-off-by: Shawn O. Pearce <> Signed-off-by: Junio C Hamano <>
2008-03-05git-pack-objects: Automatically pack annotated tags if object was packedShawn O. Pearce
The new option "--include-tag" allows the caller to request that any annotated tag be included into the packfile if the object the tag references was also included as part of the packfile. This option can be useful on the server side of a native git transport, where the server knows what commits it is including into a packfile to update the client. If new annotated tags have been introduced then we can also include them in the packfile, saving the client from needing to request them through a second connection. This change only introduces the backend option and provides a test. Protocol extensions to make this useful in fetch-pack/upload-pack are still necessary to activate the logic during transport. Signed-off-by: Shawn O. Pearce <> Signed-off-by: Junio C Hamano <>
2008-03-04Revert "unpack-objects: prevent writing of inconsistent objects"Junio C Hamano
This reverts commit d5ef408b9afb5b4417f4e7e1593a96302d666650.
2008-03-04Revert "receive-pack: use strict mode for unpacking objects"Junio C Hamano
This reverts commit 28f72a0f232dfc71b3be726e7e71d0a6d5f9ebba.
2008-03-04Merge branch 'maint'Junio C Hamano
* maint: Fix 'git remote show' regression on empty repository in 1.5.4 Fix incorrect wording in git-merge.txt. better handling of combined --squash,--no-ff,--no-commit options Fix random crashes in http_cleanup()
2008-03-03Fix incorrect wording in git-merge.txt.Matthieu Moy
A merge is not necessarily with a remote branch, it can be with any commit. Thanks to Paolo Ciarrocchi for pointing out the problem, and to Nicolas Pitre for pointing out the fact that a merge is not necessarily with a branch head. Signed-off-by: Matthieu Moy <> Signed-off-by: Junio C Hamano <>
2008-03-03git-reflog.txt: Document new commands --updateref and --rewriteBrandon Casey
Signed-off-by: Brandon Casey <> Signed-off-by: Junio C Hamano <>
2008-03-03Merge commit '74359821' into js/reflog-deleteJunio C Hamano
* commit '74359821': (128 commits) tests: introduce test_must_fail Fix builtin checkout crashing when given an invalid path templates/Makefile: don't depend on local umask setting Correct name of diff_flush() in API documentation Start preparing for format-patch: remove a leftover debugging message completion: support format-patch's --cover-letter option Eliminate confusing "won't bisect on seeked tree" failure builtin-reflog.c: don't install new reflog on write failure send-email: fix In-Reply-To regression git-svn: Don't prompt for client cert password everytime. git.el: Do not display empty directories. Fix 'git cvsexportcommit -w $cvsdir ...' when used with relative $GIT_DIR Add testcase for 'git cvsexportcommit -w $cvsdir ...' with relative $GIT_DIR Prompt to continue when editing during rebase --interactive Documentation/git svn log: add a note about timezones. git-p4: Support usage of perforce client spec git-p4: git-p4 submit cleanups. git-p4: Removed git-p4 submit --direct. git-p4: Clean up git-p4 submit's log message handling. ...
2008-03-03Update draft release notes for 1.5.5Junio C Hamano
Signed-off-by: Junio C Hamano <>
2008-03-03Merge branch 'maint'Junio C Hamano
* maint: Update draft release notes for revert: actually check for a dirty index tests: introduce test_must_fail git-submodule: Fix typo 'url' which should be '$url' receive-pack: Initialize PATH to include exec-dir. Conflicts: builtin-revert.c
2008-03-03Update draft release notes for C Hamano
Signed-off-by: Junio C Hamano <>