1Git v1.7.5 Release Notes (draft) 2======================== 3 4Updates since v1.7.4 5-------------------- 6 7 * Various MinGW portability fixes. 8 9 * Various git-p4 enhancements (in contrib). 10 11 * Various vcs-svn enhancements. 12 13 * Update to more modern HP-UX port. 14 15 * The codebase is getting prepared for i18n/l10n; no translated/translatable 16 strings in the code yet. 17 18 * "git apply -v" reports offset lines when the patch does not apply at 19 the exact location recorded in the diff output. 20 21 * "git branch --track" (and "git checkout --track --branch") used to 22 allow setting up a random non-branch that does not make sense to follow 23 as the "upstream". The command correctly diagnoses it as an error. 24 25 * "git config" used to be also known as "git repo-config", but the old 26 name is now officially deprecated. 27 28 * "git checkout --detach <commit>" is a more user friendly synonym for 29 "git checkout <commit>^0". 30 31 * "git checkout" performed on detached HEAD gives a warning and 32 advice when the commit being left behind will become unreachable from 33 any branch or tag. 34 35 * "git cherry-pick" and "git revert" can be told to use a custom merge 36 strategy, similar to "git rebase". 37 38 * "git cherry-pick" remembers which commit failed to apply when it is 39 stopped by conflicts, making it unnecessary to use "commit -c $commit" 40 to conclude it. 41 42 * "git cvsimport" bails out immediately when the cvs server cannot be 43 reached, without spewing unnecessary error messages that complain about 44 the server response it never got. 45 46 * "git grep -f <filename>" learned to treat "-" as "read from the 47 standard input stream". 48 49 * "git grep --no-index" did not honor pathspecs correctly, returning 50 paths outside the specified area. 51 52 * "git log" type commands now understand globbing pathspecs. You 53 can say "git log -- '*.txt'" for example. 54 55 * "git mergetool" learned how to drive "beyond compare 3" as well. 56 57 * "git rerere forget" without pathspec used to forget all the saved 58 conflicts that relate to the current merge; it now requires you to 59 give it pathspecs. 60 61 * "git rev-list --objects $revs -- $pathspec" now limits the objects listed 62 in its output properly with the pathspec, in preparation for narrow 63 clones. 64 65 * "git push" with no parameters gives better advice messages when 66 "tracking" is used as the push.default semantics or there is no remote 67 configured yet. 68 69 * "git rerere" learned a new subcommand "remaining" that is similar to 70 "status" and lists the paths that had conflicts which are known to 71 rerere, but excludes the paths that have already been marked as 72 resolved in the index from its output. "git mergetool" has been 73 updated to use this facility. 74 75 * A possible value to the "push.default" configuration variable, 76 'tracking', gained a synonym that more naturally describes what it 77 does, 'upstream'. 78 79Also contains various documentation updates. 80 81 82Fixes since v1.7.4 83------------------ 84 85All of the fixes in the v1.7.4.X maintenance series are included in this 86release, unless otherwise noted. 87 88 * "git apply" used to confuse lines updated by previous hunks as lines 89 that existed before when applying a hunk, contributing misapplication 90 of patches with offsets. 91 92 * "git checkout $other_branch" silently removed untracked symbolic links 93 in the working tree that are in the way in order to check out paths 94 under it from the named branch (js/checkout-untracked-symlink). 95 96--- 97exec >/var/tmp/1 98O=v1.7.4.1-352-gcdc3466 99echo O=$(git describe 'master') 100git shortlog --no-merges ^maint ^$O master