Documentation / RelNotes-1.6.2.txton commit mergetool: Add a test for running mergetool in a sub-directory (b9b5078)
   1GIT v1.6.2 Release Notes
   2========================
   3
   4Updates since v1.6.1
   5--------------------
   6
   7(subsystems)
   8
   9(portability)
  10
  11(performance)
  12
  13* pack-objects autodetects the number of CPUs available and uses threaded
  14  version.
  15
  16(usability, bells and whistles)
  17
  18* "git-add -p" learned 'g'oto action to jump directly to a hunk.
  19
  20* git-cherry defaults to HEAD when the <upstream> argument is not given.
  21
  22* git-cvsserver can be told not to add extra "via git-CVS emulator" to the
  23  commit log message it serves via gitcvs.commitmsgannotation configuration.
  24
  25* git-diff learned a new option --inter-hunk-context to coalesce close
  26  hunks together and show context between them.
  27
  28* git-filter-branch learned --prune-empty option that discards commits
  29  that do not change the contents.
  30
  31* git-ls-tree learned --full-tree option that shows the path in full
  32  regardless of where in the work tree hierarchy the command was started.
  33
  34* git-mergetool learned -y(--no-prompt) option to disable prompting.
  35
  36* "git-reset --merge" is a new mode that works similar to the way
  37  "git checkout" switches branches, taking the local changes while
  38  switching to another commit.
  39
  40(internal)
  41
  42
  43Fixes since v1.6.1
  44------------------
  45
  46All of the fixes in v1.6.1.X maintenance series are included in this
  47release, unless otherwise noted.
  48
  49* "git-add sub/file" when sub is a submodule incorrectly added the path to
  50  the superproject.
  51
  52* git-bundle did not exclude annotated tags even when a range given from the
  53  command line wanted to.
  54
  55* git-grep did not work correctly for index entries with assume-unchanged bit.
  56
  57* branch switching and merges had a silly bug that did not validate
  58  the correct directory when making sure an existing subdirectory is
  59  clean.
  60
  61--
  62exec >/var/tmp/1
  63O=v1.6.1-134-ge98c6a1
  64echo O=$(git describe master)
  65git shortlog --no-merges $O..master ^maint