Documentation / RelNotes / 1.7.5.txton commit Merge branch 'jk/merge-rename-ux' (0ce6a51)
   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 * "git apply -v" reports offset lines when the patch does not apply at
  16   the exact location recorded in the diff output.
  17
  18 * "git branch --track" (and "git checkout --track --branch") used to
  19   allow setting up a random non-branch that does not make sense to follow
  20   as the "upstream".  The command correctly diagnoses it as an error.
  21
  22 * "git config" used to be also known as "git repo-config", but the old
  23   name is now officially deprecated.
  24
  25 * "git checkout --detach <commit>" is a more user friendly synonym for
  26   "git checkout <commit>^0".
  27
  28 * "git checkout" performed on detached HEAD gives a warning and
  29   advice when the commit being left behind will become unreachable from
  30   any branch or tag.
  31
  32 * "git cherry-pick" and "git revert" can be told to use a custom merge
  33   strategy, similar to "git rebase".
  34
  35 * "git cherry-pick" remembers which commit failed to apply when it is
  36   stopped by conflicts, making it unnecessary to use "commit -c $commit"
  37   to conclude it.
  38
  39 * "git cvsimport" bails out immediately when the cvs server cannot be
  40   reached, without spewing unnecessary error messages that complain about
  41   the server response it never got.
  42
  43 * "git grep --no-index" did not honor pathspecs correctly, returning
  44   paths outside the specified area.
  45
  46 * "git log" type commands now understand globbing pathspecs.  You
  47   can say "git log -- '*.txt'" for example.
  48
  49 * "git rev-list --objects $revs -- $pathspec" now limits the objects listed
  50   in its output properly with the pathspec, in preparation for narrow
  51   clones.
  52
  53 * "git push" with no parameters gives better advice messages when
  54   "tracking" is used as the push.default semantics or there is no remote
  55   configured yet.
  56
  57 * "git rerere" learned a new subcommand "remaining" that is similar to
  58   "status" and lists the paths that had conflicts which are known to
  59   rerere, but excludes the paths that have already been marked as
  60   resolved in the index from its output.  "git mergetool" has been
  61   updated to use this facility.
  62
  63 * A possible value to the "push.default" configuration variable,
  64   'tracking', gained a synonym that more naturally describes what it
  65   does, 'upstream'.
  66
  67Also contains various documentation updates.
  68
  69
  70Fixes since v1.7.4
  71------------------
  72
  73All of the fixes in the v1.7.4.X maintenance series are included in this
  74release, unless otherwise noted.
  75
  76 * We used to keep one file descriptor open for each and every packfile
  77   that we have a mmap window on it (read: "in use"), even when for very
  78   tiny packfiles.  We now close the file descriptor early when the entire
  79   packfile fits inside one mmap window.
  80
  81 * "git apply" used to confuse lines updated by previous hunks as lines
  82   that existed before when applying a hunk, contributing misapplication
  83   of patches with offsets.
  84
  85 * "git checkout $other_branch" silently removed untracked symbolic links
  86   in the working tree that are in the way in order to check out paths
  87   under it from the named branch (js/checkout-untracked-symlink).
  88
  89 * "git submodule update" used to honor the --merge/--rebase option (or
  90   corresponding configuration variables) even for a newly cloned
  91   subproject, which made no sense (so/submodule-no-update-first-time).
  92
  93---
  94exec >/var/tmp/1
  95O=v1.7.4.1-291-g01de349
  96echo O=$(git describe 'master')
  97git shortlog --no-merges ^maint ^$O master