diff options
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/RelNotes/2.0.0.txt | 5 | ||||
| -rw-r--r-- | Documentation/config.txt | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/Documentation/RelNotes/2.0.0.txt b/Documentation/RelNotes/2.0.0.txt index 3bd2b65964..ffd4899dcd 100644 --- a/Documentation/RelNotes/2.0.0.txt +++ b/Documentation/RelNotes/2.0.0.txt @@ -179,6 +179,11 @@ Unless otherwise noted, all the fixes since v1.9 in the maintenance track are contained in this release (see the maintenance releases' notes for details). + * The remote-helepr interface to fast-import/fast-export via the + transport-helper has been tightened to avoid leaving the import + marks file from a failed/crashed run, as such a file that is out of + sync with the reality confuses a later invocation of itself. + * "git rebase" used a POSIX shell construct FreeBSD /bin/sh does not work well with. (merge 8cd6596 km/avoid-non-function-return-in-rebase later to maint). diff --git a/Documentation/config.txt b/Documentation/config.txt index d8b6cc9654..1932e9b9a2 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1340,6 +1340,10 @@ gui.diffcontext:: Specifies how many context lines should be used in calls to diff made by the linkgit:git-gui[1]. The default is "5". +gui.displayuntracked:: + Determines if linkgit::git-gui[1] shows untracked files + in the file list. The default is "true". + gui.encoding:: Specifies the default encoding to use for displaying of file contents in linkgit:git-gui[1] and linkgit:gitk[1]. |