diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-05-25 11:36:25 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-05-25 11:36:25 -0700 |
| commit | 4f64464023d0bf7ce065f1dccaf267ca38b3521f (patch) | |
| tree | 0a4e42e08c200ab448c9879528e7662e1b8c52ce /Documentation | |
| parent | 5bc2dc29d482448f2bdc0e9bbcb6e2d8a89d9c6a (diff) | |
| parent | 26e5c5d09334d157bd04f794f16f6e338d50c752 (diff) | |
| download | git-4f64464023d0bf7ce065f1dccaf267ca38b3521f.tar.gz git-4f64464023d0bf7ce065f1dccaf267ca38b3521f.tar.xz | |
Sync with 1.7.10.3
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/RelNotes/1.7.10.3.txt | 19 | ||||
| -rw-r--r-- | Documentation/git-config.txt | 4 |
2 files changed, 16 insertions, 7 deletions
diff --git a/Documentation/RelNotes/1.7.10.3.txt b/Documentation/RelNotes/1.7.10.3.txt index 153bf1403..703fbf1d6 100644 --- a/Documentation/RelNotes/1.7.10.3.txt +++ b/Documentation/RelNotes/1.7.10.3.txt @@ -6,10 +6,6 @@ Fixes since v1.7.10.2 * The message file for German translation has been updated a bit. - * "git status --porcelain" ignored "--branch" option by mistake. The - output for "git status --branch -z" was also incorrect and did not - terminate the record for the current branch name with NUL as asked. - * Running "git checkout" on an unborn branch used to corrupt HEAD. * When checking out another commit from an already detached state, we @@ -21,6 +17,9 @@ Fixes since v1.7.10.2 "checkout" phase; when run without any "--quiet" option, it should give progress to the lengthy operation. + * The directory path used in "git diff --no-index", when it recurses + down, was broken with a recent update after v1.7.10.1 release. + * "log -z --pretty=tformat:..." did not terminate each record with NUL. The fix is not entirely correct when the output also asks for --patch and/or --stat, though. @@ -29,4 +28,16 @@ Fixes since v1.7.10.2 broken and gave undue precedence to configured log.date, causing "git stash list" to show "stash@{time stamp string}". + * "git status --porcelain" ignored "--branch" option by mistake. The + output for "git status --branch -z" was also incorrect and did not + terminate the record for the current branch name with NUL as asked. + + * When a submodule repository uses alternate object store mechanism, + some commands that were started from the superproject did not + notice it and failed with "No such object" errors. The subcommands + of "git submodule" command that recursed into the submodule in a + separate process were OK; only the ones that cheated and peeked + directly into the submodule's repository from the primary process + were affected. + Also contains minor fixes and documentation updates. diff --git a/Documentation/git-config.txt b/Documentation/git-config.txt index 3f5d216a0..d9463cb38 100644 --- a/Documentation/git-config.txt +++ b/Documentation/git-config.txt @@ -198,9 +198,7 @@ If not set explicitly with '--file', there are three files where 'git config' will search for configuration options: $GIT_DIR/config:: - Repository specific configuration file. (The filename is - of course relative to the repository root, not the working - directory.) + Repository specific configuration file. ~/.gitconfig:: User-specific configuration file. Also called "global" |