diff options
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/RelNotes/2.6.4.txt | 63 | ||||
| -rw-r--r-- | Documentation/RelNotes/2.6.5.txt | 39 | ||||
| -rw-r--r-- | Documentation/RelNotes/2.7.0.txt | 140 | ||||
| -rw-r--r-- | Documentation/config.txt | 17 | ||||
| -rw-r--r-- | Documentation/diff-options.txt | 3 | ||||
| -rw-r--r-- | Documentation/git-check-ignore.txt | 10 | ||||
| -rw-r--r-- | Documentation/git-check-ref-format.txt | 2 | ||||
| -rw-r--r-- | Documentation/git-p4.txt | 4 | ||||
| -rw-r--r-- | Documentation/git-push.txt | 24 | ||||
| -rw-r--r-- | Documentation/git-send-email.txt | 11 | ||||
| -rw-r--r-- | Documentation/git-submodule.txt | 5 | ||||
| -rw-r--r-- | Documentation/git-update-index.txt | 2 | ||||
| -rw-r--r-- | Documentation/git.txt | 15 |
13 files changed, 247 insertions, 88 deletions
diff --git a/Documentation/RelNotes/2.6.4.txt b/Documentation/RelNotes/2.6.4.txt new file mode 100644 index 000000000..b0256a2dc --- /dev/null +++ b/Documentation/RelNotes/2.6.4.txt @@ -0,0 +1,63 @@ +Git v2.6.4 Release Notes +======================== + +Fixes since v2.6.3 +------------------ + + * The "configure" script did not test for -lpthread correctly, which + upset some linkers. + + * Add support for talking http/https over socks proxy. + + * Portability fix for Windows, which may rewrite $SHELL variable using + non-POSIX paths. + + * We now consistently allow all hooks to ignore their standard input, + rather than having git complain of SIGPIPE. + + * Fix shell quoting in contrib script. + + * Test portability fix for a topic in v2.6.1. + + * Allow tilde-expansion in some http config variables. + + * Give a useful special case "diff/show --word-diff-regex=." as an + example in the documentation. + + * Fix for a corner case in filter-branch. + + * Make git-p4 work on a detached head. + + * Documentation clarification for "check-ignore" without "--verbose". + + * Just like the working tree is cleaned up when the user cancelled + submission in P4Submit.applyCommit(), clean up the mess if "p4 + submit" fails. + + * Having a leftover .idx file without corresponding .pack file in + the repository hurts performance; "git gc" learned to prune them. + + * The code to prepare the working tree side of temporary directory + for the "dir-diff" feature forgot that symbolic links need not be + copied (or symlinked) to the temporary area, as the code already + special cases and overwrites them. Besides, it was wrong to try + computing the object name of the target of symbolic link, which may + not even exist or may be a directory. + + * There was no way to defeat a configured rebase.autostash variable + from the command line, as "git rebase --no-autostash" was missing. + + * Allow "git interpret-trailers" to run outside of a Git repository. + + * Produce correct "dirty" marker for shell prompts, even when we + are on an orphan or an unborn branch. + + * Some corner cases have been fixed in string-matching done in "git + status". + + * Apple's common crypto implementation of SHA1_Update() does not take + more than 4GB at a time, and we now have a compile-time workaround + for it. + +Also contains typofixes, documentation updates and trivial code +clean-ups. diff --git a/Documentation/RelNotes/2.6.5.txt b/Documentation/RelNotes/2.6.5.txt new file mode 100644 index 000000000..3e6331d9d --- /dev/null +++ b/Documentation/RelNotes/2.6.5.txt @@ -0,0 +1,39 @@ +Git v2.6.5 Release Notes +======================== + +Fixes since v2.6.4 +------------------ + + * Because "test_when_finished" in our test framework queues the + clean-up tasks to be done in a shell variable, it should not be + used inside a subshell. Add a mechanism to allow 'bash' to catch + such uses, and fix the ones that were found. + + * Update "git subtree" (in contrib/) so that it can take whitespaces + in the pathnames, not only in the in-tree pathname but the name of + the directory that the repository is in. + + * Cosmetic improvement to lock-file error messages. + + * mark_tree_uninteresting() has code to handle the case where it gets + passed a NULL pointer in its 'tree' parameter, but the function had + 'object = &tree->object' assignment before checking if tree is + NULL. This gives a compiler an excuse to declare that tree will + never be NULL and apply a wrong optimization. Avoid it. + + * The helper used to iterate over loose object directories to prune + stale objects did not closedir() immediately when it is done with a + directory--a callback such as the one used for "git prune" may want + to do rmdir(), but it would fail on open directory on platforms + such as WinXP. + + * "git p4" used to import Perforce CLs that touch only paths outside + the client spec as empty commits. It has been corrected to ignore + them instead, with a new configuration git-p4.keepEmptyCommits as a + backward compatibility knob. + + * The exit code of git-fsck did not reflect some types of errors + found in packed objects, which has been corrected. + +Also contains typofixes, documentation updates and trivial code +clean-ups. diff --git a/Documentation/RelNotes/2.7.0.txt b/Documentation/RelNotes/2.7.0.txt index ca2c24bea..a84caba08 100644 --- a/Documentation/RelNotes/2.7.0.txt +++ b/Documentation/RelNotes/2.7.0.txt @@ -51,7 +51,6 @@ UI, Workflows & Features * Prepare for Git on-disk repository representation to undergo backward incompatible changes by introducing a new repository format version "1", with an extension mechanism. - (merge 067fbd4 jk/repository-extension later to maint). * "git worktree" learned a "list" subcommand. @@ -66,6 +65,20 @@ UI, Workflows & Features a superset of "--no-progress". Extend the command to support the usual "--[no-]progress". + * The semantics of tranfer.hideRefs configuration variable have been + extended to work better with the ref "namespace" feature that lets + you throw unrelated bunches of repositories in a single physical + repository and virtually serve them as separate ones. + + * send-email config variables whose values are pathnames now go + through the ~username/ expansion. + + * bash completion learnt to TAB-complete recipient addresses given + to send-email. + + * The credential-cache daemon can be told to ignore SIGHUP to work + around issue when running Git from inside emacs. + Performance, Internal Implementation, Development Support etc. @@ -84,11 +97,9 @@ Performance, Internal Implementation, Development Support etc. clean-up tasks to be done in a shell variable, it should not be used inside a subshell. Add a mechanism to allow 'bash' to catch such uses, and fix the ones that were found. - (merge 0968f12 jk/test-lint-forbid-when-finished-in-subshell later to maint). * The debugging infrastructure for pkt-line based communication has been improved to mark the side-band communication specifically. - (merge fd89433 jk/async-pkt-line later to maint). * Update "git branch" that list existing branches, using the ref-filter API that is shared with "git tag" and "git @@ -106,7 +117,6 @@ Performance, Internal Implementation, Development Support etc. * The internal stripspace() function has been moved to where it logically belongs to, i.e. strbuf API, and the command line parser of "git stripspace" has been updated to use the parse_options API. - (merge bed4452 tk/stripspace later to maint). * "git am" used to spawn "git mailinfo" via run_command() API once per each patch, but learned to make a direct call to mailinfo() @@ -118,6 +128,39 @@ Performance, Internal Implementation, Development Support etc. * With a "debug" helper, debugging of a single "git" invocation in our test scripts has become a lot easier. + * The "configure" script did not test for -lpthread correctly, which + upset some linkers. + + * Cross completed task off of subtree project's todo list. + + * Test cleanups for the subtree project. + + * Clean up style in an ancient test t9300. + + * Work around some test flakiness with p4d. + + * Fsck did not correctly detect a NUL-truncated header in a tag. + + * Use a safer behavior when we hit errors verifying remote certificates. + + * Speed up filter-branch for cases where we only care about rewriting + commits, not tree data. + + * The parse-options API has been updated to make "-h" command line + option work more consistently in all commands. + + * "git svn rebase/mkdirs" got optimized by keeping track of empty + directories better. + + * Fix some racy client/server tests by treating SIGPIPE the same as a + normal non-zero exit. + + * The necessary infrastructure to build topics using the free Travis + CI has been added. Developers forking from this topic (and enabling + Travis) can do their own builds, and we can turn on auto-builds for + git/git (including build-status for pull requests that people + open). + Also contains various documentation updates and code clean-ups. @@ -133,63 +176,51 @@ notes for details). (which is not a great UI element as they can only appear at the end of the command line). Add notice to documentation of each and every one of them. - (merge 2b594bf mm/keyid-docs later to maint). * "git blame --first-parent v1.0..v2.0" was not rejected but did not limit the blame to commits on the first parent chain. - (merge 95a4fb0 jk/blame-first-parent later to maint). * "git subtree" (in contrib/) now can take whitespaces in the pathnames, not only in the in-tree pathname but the name of the - directory that the repository is in. (merge 5b6ab38 - as/subtree-with-spaces later to maint). + directory that the repository is in. * The ssh transport, just like any other transport over the network, did not clear GIT_* environment variables, but it is possible to use SendEnv and AcceptEnv to leak them to the remote invocation of Git, which is not a good idea at all. Explicitly clear them just like we do for the local transport. - (merge a48b409 jk/connect-clear-env later to maint). * Correct "git p4 --detect-labels" so that it does not fail to create a tag that points at a commit that is also being imported. - (merge b43702a ld/p4-import-labels later to maint). * The Makefile always runs the library archiver with hardcoded "crs" options, which was inconvenient for exotic platforms on which people want to use programs with totally different set of command line options. - (merge ac179b4 jw/make-arflags-customizable later to maint). * Customization to change the behaviour with "make -w" and "make -s" in our Makefile was broken when they were used together. - (merge ef49e05 jk/make-findstring-makeflags-fix later to maint). * Allocation related functions and stdio are unsafe things to call inside a signal handler, and indeed killing the pager can cause glibc to deadlock waiting on allocation mutex as our signal handler tries to free() some data structures in wait_for_pager(). Reduce these unsafe calls. - (merge 507d780 ti/glibc-stdio-mutex-from-signal-handler later to maint). * The way how --ref/--notes to specify the notes tree reference are DWIMmed was not clearly documented. - (merge e14c92e jk/notes-dwim-doc later to maint). * "git gc" used to barf when a symbolic ref has gone dangling (e.g. the branch that used to be your upstream's default when you cloned from it is now gone, and you did "fetch --prune"). - (merge 14886b4 js/gc-with-stale-symref later to maint). * "git clone --dissociate" runs a big "git repack" process at the end, and it helps to close file descriptors that are open on the packs and their idx files before doing so on filesystems that cannot remove a file that is still open. - (merge 786b150 js/clone-dissociate later to maint). * Description of the "log.follow" configuration variable in "git log" documentation is now also copied to "git config" documentation. - (merge fd8d07e dt/log-follow-config later to maint). * "git rebase -i" had a minor regression recently, which stopped considering a line that begins with an indented '#' in its insn @@ -197,93 +228,73 @@ notes for details). Windows where CRLF left by the editor is turned into a trailing CR on the line read via the "read" built-in command of bash. Both of these issues are now fixed. - (merge 39743cf gr/rebase-i-drop-warn later to maint). * After "git checkout --detach", "git status" reported a fairly useless "HEAD detached at HEAD", instead of saying at which exact commit. - (merge 0eb8548 mm/detach-at-HEAD-reflog later to maint). * When "git send-email" wanted to talk over Net::SMTP::SSL, Net::Cmd::datasend() did not like to be fed too many bytes at the same time and failed to send messages. Send the payload one line at a time to work around the problem. - (merge f60c483 sa/send-email-smtp-batch-data-limit later to maint). * When "git am" was rewritten as a built-in, it stopped paying attention to user.signingkey, which was fixed. - (merge 434c64d pt/am-builtin later to maint). * It was not possible to use a repository-lookalike created by "git worktree add" as a local source of "git clone". - (merge d78db84 nd/clone-linked-checkout later to maint). * On a case insensitive filesystems, setting GIT_WORK_TREE variable using a random cases that does not agree with what the filesystem thinks confused Git that it wasn't inside the working tree. - (merge 63ec5e1 js/icase-wt-detection later to maint). * Performance-measurement tests did not work without an installed Git. - (merge 31cd128 sb/perf-without-installed-git later to maint). * A test script for the HTTP service had a timing dependent bug, which was fixed. - (merge 362d8b6 sb/http-flaky-test-fix later to maint). * There were some classes of errors that "git fsck" diagnosed to its standard error that did not cause it to exit with non-zero status. - (merge 122f76f jc/fsck-dropped-errors later to maint). * Work around "git p4" failing when the P4 depot records the contents in UTF-16 without UTF-16 BOM. - (merge 1f5f390 ls/p4-translation-failure later to maint). * When "git gc --auto" is backgrounded, its diagnosis message is lost. Save it to a file in $GIT_DIR and show it next time the "gc --auto" is run. - (merge 329e6e8 nd/gc-auto-background-fix later to maint). * The submodule code has been taught to work better with separate work trees created via "git worktree add". - (merge 11f9dd7 mk/submodule-gitdir-path later to maint). * "git gc" is safe to run anytime only because it has the built-in grace period to protect young objects. In order to run with no grace period, the user must make sure that the repository is quiescent. - (merge fae1a90 jc/doc-gc-prune-now later to maint). * A recent "filter-branch --msg-filter" broke skipping of the commit object header, which is fixed. - (merge a5a4b3f jk/filter-branch-use-of-sed-on-incomplete-line later to maint). * The normalize_ceiling_entry() function does not muck with the end of the path it accepts, and the real world callers do rely on that, but a test insisted that the function drops a trailing slash. - (merge b2a7123 rd/test-path-utils later to maint). * A test for interaction between untracked cache and sparse checkout added in Git 2.5 days were flaky. - (merge 9b680fb dt/t7063-fix-flaky-test later to maint). * A couple of commands still showed "[options]" in their usage string to note where options should come on their command line, but we spell that "[<options>]" in most places these days. - (merge d96a031 rt/placeholder-in-usage later to maint). * The synopsis text and the usage string of subcommands that read list of things from the standard input are often shown as if they only take input from a file on a filesystem, which was misleading. - (merge 33e8fc8 jc/usage-stdin later to maint). * "git am -3" had a small regression where it is aborted in its error handling codepath when underlying merge-recursive failed in certain ways, as it assumed that the internal call to merge-recursive will never die, which is not the case (yet). - (merge c63d4b2 jc/am-3-fallback-regression-fix later to maint). * The linkage order of libraries was wrong in places around libcurl. - (merge 7e91e8d rp/link-curl-before-ssl later to maint). * The name-hash subsystem that is used to cope with case insensitive filesystems keeps track of directories and their on-filesystem @@ -293,40 +304,31 @@ notes for details). cache entry was removed from the index, leading to use after free. This was fixed by recording the path for each directory instead of borrowing cache entries and restructuring the API somewhat. - (merge 41284eb dt/name-hash-dir-entry-fix later to maint). * "git merge-file" tried to signal how many conflicts it found, which obviously would not work well when there are too many of them. - (merge e34f802 jk/merge-file-exit-code later to maint). * The error message from "git blame --contents --reverse" incorrectly talked about "--contents --children". - (merge 9526197 mk/blame-error-message later to maint). * "git imap-send" did not compile well with older version of cURL library. - (merge 71d9257 js/imap-send-curl-compilation-fix later to maint). * Merging a branch that removes a path and another that changes the mode bits on the same path should have conflicted at the path, but it didn't and silently favoured the removal. - (merge 72fac66 jk/delete-modechange-conflict later to maint). * "git --literal-pathspecs add -u/-A" without any command line argument misbehaved ever since Git 2.0. - (merge 29abb33 jc/add-u-A-default-to-top later to maint). * "git daemon" uses "run_command()" without "finish_command()", so it needs to release resources itself, which it forgot to do. - (merge b1b49ff rs/daemon-plug-child-leak later to maint). * "git status --branch --short" accessed beyond the constant string "HEAD", which has been corrected. - (merge c72b49d rs/wt-status-detached-branch-fix later to maint). * We peek objects from submodule's object store by linking it to the list of alternate object databases, but the code to do so forgot to correctly initialize the list. - (merge 9a6e4f0 jk/initialization-fix-to-add-submodule-odb later to maint). * The code to prepare the working tree side of temporary directory for the "dir-diff" feature forgot that symbolic links need not be @@ -334,28 +336,38 @@ notes for details). special cases and overwrites them. Besides, it was wrong to try computing the object name of the target of symbolic link, which may not even exist or may be a directory. - (merge cfe2d4b da/difftool later to maint). * A Range: request can be responded with a full response and when asked properly libcurl knows how to strip the result down to the requested range. However, we were hand-crafting a range request and it did not kick in. + * Having a leftover .idx file without corresponding .pack file in + the repository hurts performance; "git gc" learned to prune them. + + * Apple's common crypto implementation of SHA1_Update() does not take + more than 4GB at a time, and we now have a compile-time workaround + for it. + + * Produce correct "dirty" marker for shell prompts, even when we + are on an orphan or an unborn branch. + + * A build without NO_IPv6 used to use gethostbyname() when guessing + user's hostname, instead of getaddrinfo() that is used in other + codepaths in such a build. + + * The exit code of git-fsck did not reflect some types of errors + found in packed objects, which has been corrected. + + * The helper used to iterate over loose object directories to prune + stale objects did not closedir() immediately when it is done with a + directory--a callback such as the one used for "git prune" may want + to do rmdir(), but it would fail on open directory on platforms + such as WinXP. + + * "git p4" used to import Perforce CLs that touch only paths outside + the client spec as empty commits. It has been corrected to ignore + them instead, with a new configuration git-p4.keepEmptyCommits as a + backward compatibility knob. + * Code clean-up, minor fixes etc. - (merge 15ed07d jc/rerere later to maint). - (merge e7a7401 pt/pull-builtin later to maint). - (merge 29bc480 nd/ls-remote-does-not-have-u-option later to maint). - (merge be510e0 jk/asciidoctor-section-heading-markup-fix later to maint). - (merge 83e6bda tk/typofix-connect-unknown-proto-error later to maint). - (merge a43eb67 tk/doc-interpret-trailers-grammo later to maint). - (merge ba128e2 es/worktree-add-cleanup later to maint). - (merge 44cd91e cc/quote-comments later to maint). - (merge 147875f sb/submodule-config-parse later to maint). - (merge ae9f274 es/worktree-add later to maint). - (merge 3b19dba jc/em-dash-in-doc later to maint). - (merge f3f38c7 jc/everyday-markup later to maint). - (merge 77d5f71 xf/user-manual-markup later to maint). - (merge b2af482 xf/user-manual-ff later to maint). - (merge e510ab8 rs/pop-commit later to maint). - (merge fdcdb77 js/misc-fixes later to maint). - (merge c949b00 rs/show-branch-argv-array later to maint). diff --git a/Documentation/config.txt b/Documentation/config.txt index b4b01948d..f61788668 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1122,6 +1122,9 @@ credential.<url>.*:: example.com. See linkgit:gitcredentials[7] for details on how URLs are matched. +credentialCache.ignoreSIGHUP:: + Tell git-credential-cache--daemon to ignore SIGHUP, instead of quitting. + include::diff-config.txt[] difftool.<tool>.path:: @@ -2226,6 +2229,20 @@ push.gpgSign:: override a value from a lower-priority config file. An explicit command-line flag always overrides this config option. +push.recurseSubmodules:: + Make sure all submodule commits used by the revisions to be pushed + are available on a remote-tracking branch. If the value is 'check' + then Git will verify that all submodule commits that changed in the + revisions to be pushed are available on at least one remote of the + submodule. If any commits are missing, the push will be aborted and + exit with non-zero status. If the value is 'on-demand' then all + submodules that changed in the revisions to be pushed will be + pushed. If on-demand was not able to push all necessary revisions + it will also be aborted and exit with non-zero status. If the value + is 'no' then default behavior of ignoring submodules when pushing + is retained. You may override this configuration at time of push by + specifying '--recurse-submodules=check|on-demand|no'. + rebase.stat:: Whether to show a diffstat of what changed upstream since the last rebase. False by default. diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index d56ca9099..306b7e360 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@ -267,6 +267,9 @@ expression to make sure that it matches all non-whitespace characters. A match that contains a newline is silently truncated(!) at the newline. + +For example, `--word-diff-regex=.` will treat each character as a word +and, correspondingly, show differences character by character. ++ The regex can also be set via a diff driver or configuration option, see linkgit:gitattributes[1] or linkgit:git-config[1]. Giving it explicitly overrides any diff driver or configuration setting. Diff drivers diff --git a/Documentation/git-check-ignore.txt b/Documentation/git-check-ignore.txt index 59531abba..e94367a5e 100644 --- a/Documentation/git-check-ignore.txt +++ b/Documentation/git-check-ignore.txt @@ -16,10 +16,9 @@ DESCRIPTION ----------- For each pathname given via the command-line or from a file via -`--stdin`, show the pattern from .gitignore (or other input files to -the exclude mechanism) that decides if the pathname is excluded or -included. Later patterns within a file take precedence over earlier -ones. +`--stdin`, check whether the file is excluded by .gitignore (or other +input files to the exclude mechanism) and output the path if it is +excluded. By default, tracked files are not shown at all since they are not subject to exclude rules; but see `--no-index'. @@ -32,7 +31,8 @@ OPTIONS -v, --verbose:: Also output details about the matching pattern (if any) - for each given pathname. + for each given pathname. For precedence rules within and + between exclude sources, see linkgit:gitignore[5]. --stdin:: Read pathnames from the standard input, one per line, diff --git a/Documentation/git-check-ref-format.txt b/Documentation/git-check-ref-format.txt index 9044dfaad..91a3622ee 100644 --- a/Documentation/git-check-ref-format.txt +++ b/Documentation/git-check-ref-format.txt @@ -60,7 +60,7 @@ Git imposes the following rules on how references are named: These rules make it easy for shell script based tools to parse reference names, pathname expansion by the shell when a reference name is used -unquoted (by mistake), and also avoids ambiguities in certain +unquoted (by mistake), and also avoid ambiguities in certain reference name expressions (see linkgit:gitrevisions[7]): . A double-dot `..` is often used as in `ref1..ref2`, and in some diff --git a/Documentation/git-p4.txt b/Documentation/git-p4.txt index c3ff7d0d9..738cfde10 100644 --- a/Documentation/git-p4.txt +++ b/Documentation/git-p4.txt @@ -549,6 +549,10 @@ git-p4.largeFilePush:: Boolean variable which defines if large files are automatically pushed to a server. +git-p4.keepEmptyCommits:: + A changelist that contains only excluded files will be imported + as an empty commit if this boolean option is set to true. + Submit variables ~~~~~~~~~~~~~~~~ git-p4.detectRenames:: diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt index 85a4d7d6d..4c775bcec 100644 --- a/Documentation/git-push.txt +++ b/Documentation/git-push.txt @@ -257,16 +257,20 @@ origin +master` to force a push to the `master` branch). See the is specified. This flag forces progress status even if the standard error stream is not directed to a terminal. ---recurse-submodules=check|on-demand:: - Make sure all submodule commits used by the revisions to be - pushed are available on a remote-tracking branch. If 'check' is - used Git will verify that all submodule commits that changed in - the revisions to be pushed are available on at least one remote - of the submodule. If any commits are missing the push will be - aborted and exit with non-zero status. If 'on-demand' is used - all submodules that changed in the revisions to be pushed will - be pushed. If on-demand was not able to push all necessary - revisions it will also be aborted and exit with non-zero status. +--no-recurse-submodules:: +--recurse-submodules=check|on-demand|no:: + May be used to make sure all submodule commits used by the + revisions to be pushed are available on a remote-tracking branch. + If 'check' is used Git will verify that all submodule commits that + changed in the revisions to be pushed are available on at least one + remote of the submodule. If any commits are missing the push will + be aborted and exit with non-zero status. If 'on-demand' is used + all submodules that changed in the revisions to be pushed will be + pushed. If on-demand was not able to push all necessary revisions + it will also be aborted and exit with non-zero status. A value of + 'no' or using '--no-recurse-submodules' can be used to override the + push.recurseSubmodules configuration variable when no submodule + recursion is required. --[no-]verify:: Toggle the pre-push hook (see linkgit:githooks[5]). The diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt index b9134d234..771a7b5b0 100644 --- a/Documentation/git-send-email.txt +++ b/Documentation/git-send-email.txt @@ -10,6 +10,7 @@ SYNOPSIS -------- [verse] 'git send-email' [options] <file|directory|rev-list options>... +'git send-email' --dump-aliases DESCRIPTION @@ -387,6 +388,16 @@ default to '--validate'. Send emails even if safety checks would prevent it. +Information +~~~~~~~~~~~ + +--dump-aliases:: + Instead of the normal operation, dump the shorthand alias names from + the configured alias file(s), one per line in alphabetical order. Note, + this only includes the alias name and not its expanded email addresses. + See 'sendemail.aliasesfile' for more information about aliases. + + CONFIGURATION ------------- diff --git a/Documentation/git-submodule.txt b/Documentation/git-submodule.txt index f17687e09..1572f058f 100644 --- a/Documentation/git-submodule.txt +++ b/Documentation/git-submodule.txt @@ -237,6 +237,9 @@ sync:: + "git submodule sync" synchronizes all submodules while "git submodule sync \-- A" synchronizes submodule "A" only. ++ +If `--recursive` is specified, this command will recurse into the +registered submodules, and sync any nested submodules within. OPTIONS ------- @@ -364,7 +367,7 @@ the submodule itself. for linkgit:git-clone[1]'s `--reference` and `--shared` options carefully. --recursive:: - This option is only valid for foreach, update and status commands. + This option is only valid for foreach, update, status and sync commands. Traverse submodules recursively. The operation is performed not only in the submodules of the current repo, but also in any nested submodules inside those submodules (and so on). diff --git a/Documentation/git-update-index.txt b/Documentation/git-update-index.txt index 1a296bc29..f4e5a8535 100644 --- a/Documentation/git-update-index.txt +++ b/Documentation/git-update-index.txt @@ -17,6 +17,8 @@ SYNOPSIS [--[no-]assume-unchanged] [--[no-]skip-worktree] [--ignore-submodules] + [--[no-]split-index] + [--[no-|force-]untracked-cache] [--really-refresh] [--unresolve] [--again | -g] [--info-only] [--index-info] [-z] [--stdin] [--index-version <n>] diff --git a/Documentation/git.txt b/Documentation/git.txt index c2e2a94e7..cbf157be4 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -43,9 +43,10 @@ unreleased) version of Git, that is available from the 'master' branch of the `git.git` repository. Documentation for older releases are available here: -* link:v2.6.3/git.html[documentation for release 2.6.3] +* link:v2.6.4/git.html[documentation for release 2.6.4] * release notes for + link:RelNotes/2.6.4.txt[2.6.4], link:RelNotes/2.6.3.txt[2.6.3], link:RelNotes/2.6.2.txt[2.6.2], link:RelNotes/2.6.1.txt[2.6.1], @@ -1056,7 +1057,7 @@ of clones and fetches. cloning of shallow repositories. See 'GIT_TRACE' for available trace output options. -GIT_LITERAL_PATHSPECS:: +'GIT_LITERAL_PATHSPECS':: Setting this variable to `1` will cause Git to treat all pathspecs literally, rather than as glob patterns. For example, running `GIT_LITERAL_PATHSPECS=1 git log -- '*.c'` will search @@ -1065,15 +1066,15 @@ GIT_LITERAL_PATHSPECS:: literal paths to Git (e.g., paths previously given to you by `git ls-tree`, `--raw` diff output, etc). -GIT_GLOB_PATHSPECS:: +'GIT_GLOB_PATHSPECS':: Setting this variable to `1` will cause Git to treat all pathspecs as glob patterns (aka "glob" magic). -GIT_NOGLOB_PATHSPECS:: +'GIT_NOGLOB_PATHSPECS':: Setting this variable to `1` will cause Git to treat all pathspecs as literal (aka "literal" magic). -GIT_ICASE_PATHSPECS:: +'GIT_ICASE_PATHSPECS':: Setting this variable to `1` will cause Git to treat all pathspecs as case-insensitive. @@ -1087,7 +1088,7 @@ GIT_ICASE_PATHSPECS:: variable when it is invoked as the top level command by the end user, to be recorded in the body of the reflog. -`GIT_REF_PARANOIA`:: +'GIT_REF_PARANOIA':: If set to `1`, include broken or badly named refs when iterating over lists of refs. In a normal, non-corrupted repository, this does nothing. However, enabling it may help git to detect and @@ -1098,7 +1099,7 @@ GIT_ICASE_PATHSPECS:: an operation has touched every ref (e.g., because you are cloning a repository to make a backup). -`GIT_ALLOW_PROTOCOL`:: +'GIT_ALLOW_PROTOCOL':: If set, provide a colon-separated list of protocols which are allowed to be used with fetch/push/clone. This is useful to restrict recursive submodule initialization from an untrusted |