1GIT v1.6.0 Release Notes 2======================== 3 4User visible changes 5-------------------- 6 7With the default Makefile settings, most of the programs are now 8installed outside your $PATH, except for "git", "gitk", "git-gui" and 9some server side programs that need to be accessible for technical 10reasons. Invoking a git subcommand as "git-xyzzy" from the command 11line has been deprecated since early 2006 (and officially announced in 121.5.4 release notes); use of them from your scripts after adding 13output from "git --exec-path" to the $PATH is still supported in this 14release, but users are again strongly encouraged to adjust their 15scripts to use "git xyzzy" form, as we will stop installing 16"git-xyzzy" hardlinks for built-in commands in later releases. 17 18Source changes needed for porting to MinGW environment are now all in the 19main git.git codebase. 20 21By default, packfiles created with this version uses delta-base-offset 22encoding introduced in v1.4.4. Pack idx files are using version 2 that 23allows larger packs and added robustness thanks to its CRC checking, 24introduced in v1.5.2 and v1.4.4.5. If you want to keep your repositories 25backwards compatible past these versions, set repack.useDeltaBaseOffset 26to false or pack.indexVersion to 1, respectively. 27 28GIT_CONFIG, which was only documented as affecting "git config", but 29actually affected all git commands, now only affects "git config". 30GIT_LOCAL_CONFIG, also only documented as affecting "git config" and 31not different from GIT_CONFIG in a useful way, is removed. 32 33The ".dotest" temporary area "git am" and "git rebase" use is now moved 34inside the $GIT_DIR, to avoid mistakes of adding it to the project by 35accident. 36 37An ancient merge strategy "stupid" has been removed. 38 39 40Updates since v1.5.6 41-------------------- 42 43(subsystems) 44 45* git-p4 in contrib learned "allowSubmit" configuration to control on 46 which branch to allow "submit" subcommand. 47 48* git-gui learned to stage changes per-line. 49 50(portability) 51 52* Changes for MinGW port have been merged, thanks to Johannes Sixt and 53 gangs. 54 55* Sample hook scripts shipped in templates/ are now suffixed with 56 *.sample. We used to prevent them from triggering by default by 57 relying on the fact that we install them as unexecutable, but on 58 some filesystems this approach does not work. Instead of running 59 "chmod +x" on them, the users who want to activate these samples 60 as-is can now rename them dropping *.sample suffix. 61 62* perl's in-place edit (-i) does not work well without backup files on Windows; 63 some tests are rewritten to cope with this. 64 65(documentation) 66 67* Updated howto/update-hook-example 68 69* Got rid of usage of "git-foo" from the tutorial and made typography 70 more consistent. 71 72* Disambiguating "--" between revs and paths is finally documented. 73 74(performance, robustness, sanity etc.) 75 76* index-pack used too much memory when dealing with a deep delta chain. 77 This has been optimized. 78 79* reduced excessive inlining to shrink size of the "git" binary. 80 81* verify-pack checks the object CRC when using version 2 idx files. 82 83* When an object is corrupt in a pack, the object became unusable even 84 when the same object is available in a loose form, We now try harder to 85 fall back to these redundant objects when able. In particular, "git 86 repack -a -f" can be used to fix such a corruption as long as necessary 87 objects are available. 88 89* Performance of "git-blame -C -C" operation is vastly improved. 90 91* git-clone does not create refs in loose form anymore (it behaves as 92 if you immediately ran git-pack-refs after cloning). This will help 93 repositories with insanely large number of refs. 94 95* core.fsyncobjectfiles configuration can be used to ensure that the loose 96 objects created will be fsync'ed (this is only useful on filesystems 97 that does not order data writes properly). 98 99* "git commit-tree" plumbing can make Octopus with more than 16 parents. 100 "git commit" has been capable of this for quite some time. 101 102(usability, bells and whistles) 103 104* even more documentation pages are now accessible via "man" and "git help". 105 106* A new environment variable GIT_CEILING_DIRECTORIES can be used to stop 107 the discovery process of the toplevel of working tree; this may be useful 108 when you are working in a slow network disk and are outside any working tree, 109 as bash-completion and "git help" may still need to run in these places. 110 111* By default, stash entries never expire. Set reflogexpire in [gc 112 "refs/stash"] to a reasonable value to get traditional auto-expiration 113 behaviour back 114 115* Longstanding latency issue with bash completion script has been 116 addressed. This will need to be backmerged to 'maint' later. 117 118* pager.<cmd> configuration variable can be used to enable/disable the 119 default paging behaviour per command. 120 121* "git-add -i" has a new action 'e/dit' to allow you edit the patch hunk 122 manually. 123 124* git-am records the original tip of the branch in ORIG_HEAD before it 125 starts applying patches. 126 127* git-apply can handle a patch that touches the same path more than once 128 much better than before. 129 130* git-apply can be told not to trust the line counts recorded in the input 131 patch but recount, with the new --recount option. 132 133* git-apply can be told to apply a patch to a path deeper than what the 134 patch records with --directory option. 135 136* git-archive can be told to omit certain paths from its output using 137 export-ignore attributes. 138 139* With -v option, git-branch describes the remote tracking statistics 140 similar to the way git-checkout reports by how many commits your branch 141 is ahead/behind. 142 143* git-branch's --contains option used to always require a commit parameter 144 to limit the branches with; it now defaults to list branches that 145 contains HEAD if this parameter is omitted. 146 147* git-branch's --merged and --no-merged option used to always limit the 148 branches relative to the HEAD, but they can now take an optional commit 149 argument that is used in place of HEAD. 150 151* git-bundle can read the revision arguments from the standard input. 152 153* git-cherry-pick can replay a root commit now. 154 155* git-clone can clone from a remote whose URL would be rewritten by 156 configuration stored in $HOME/.gitconfig now. 157 158* git-diff --check now checks leftover merge conflict markers. 159 160* When remote side used to have branch 'foo' and git-fetch finds that now 161 it has branch 'foo/bar', it refuses to lose the existing remote tracking 162 branch and its reflog. The error message has been improved to suggest 163 pruning the remote if the user wants to proceed and get the latest set 164 of branches from the remote, including such 'foo/bar'. 165 166* fast-export learned to export and import marks file; this can be used to 167 interface with fast-import incrementally. 168 169* git-rebase records the original tip of branch in ORIG_HEAD before it is 170 rewound. 171 172* "git rerere" can be told to update the index with auto-reused resolution 173 with rerere.autoupdate configuration variable. 174 175* git-rev-list learned --children option to show child commits it 176 encountered during the traversal, instead of shoing parent commits. 177 178* git-send-mail can talk not just over SSL but over TLS now. 179 180* git-shortlog honors custom output format specified with "--pretty=format:". 181 182* "git-stash save" learned --keep-index option. This lets you stash away the 183 local changes and bring the changes staged in the index to your working 184 tree for examination and testing. 185 186* git-stash also learned branch subcommand to create a new branch out of 187 stashed changes. 188 189* git-status gives the remote tracking statistics similar to the way 190 git-checkout reports by how many commits your branch is ahead/behind. 191 192* You can tell "git status -u" to even more aggressively omit checking 193 untracked files with --untracked-files=no. 194 195* Original SHA-1 value for "update-ref -d" is optional now. 196 197* Error codes from gitweb are made more descriptive where possible, rather 198 than "403 forbidden" as we used to issue everywhere. 199 200(internal) 201 202* git-merge has been reimplemented in C. 203 204 205Fixes since v1.5.6 206------------------ 207 208All of the fixes in v1.5.6 maintenance series are included in 209this release, unless otherwise noted. 210 211--- 212exec >/var/tmp/1 213O=v1.5.6.3-436-g1f8dc67 214echo O=$(git describe refs/heads/master) 215git shortlog --no-merges $O..refs/heads/master ^refs/heads/maint