Documentation / RelNotes-1.6.2.txton commit Merge branch 'jg/mergetool' (2edefe3)
   1GIT v1.6.2 Release Notes
   2========================
   3
   4Updates since v1.6.1
   5--------------------
   6
   7(subsystems)
   8
   9* git-svn updates.
  10
  11* gitweb updates, including a new patch view and RSS/Atom feed
  12  improvements.
  13
  14(portability)
  15
  16(performance)
  17
  18* pack-objects autodetects the number of CPUs available and uses threaded
  19  version.
  20
  21(usability, bells and whistles)
  22
  23* automatic typo correction works on aliases as well
  24
  25* @{-1} is a way to refer to the last branch you were on.  This is
  26  accepted not only where an object name is expected, but anywhere
  27  a branch name is expected.  E.g. "git branch --track mybranch @{-1}"
  28  "git rev-parse --symbolic-full-name @{-1}".
  29
  30* "git add -p" learned 'g'oto action to jump directly to a hunk.
  31
  32* when "git am" stops upon a patch that does not apply, it shows the
  33  title of the offending patch.
  34
  35* "git am --directory=<dir>" and "git am --reject" passes these options
  36  to underlying "git apply".
  37
  38* "git clone" now makes its best effort when cloning from an empty
  39  repository to set up configuration variables to refer to the remote
  40  repository.
  41
  42* "git checkout -" is a shorthand for "git checkout @{-1}".
  43
  44* "git cherry" defaults to whatever the current branch is tracking (if
  45  exists) when the <upstream> argument is not given.
  46
  47* "git cvsserver" can be told not to add extra "via git-CVS emulator" to
  48  the commit log message it serves via gitcvs.commitmsgannotation
  49  configuration.
  50
  51* "git diff" learned a new option --inter-hunk-context to coalesce close
  52  hunks together and show context between them.
  53
  54* The definition of what constitutes a word for "git diff --color-words"
  55  can be customized via gitattributes, command line or a configuration.
  56
  57* "git diff" learned --patience to run "patience diff" algorithm.
  58
  59* Some combinations of -b/-w/--ignore-space-at-eol to "git diff" did
  60  not work as expected.
  61
  62* "git filter-branch" learned --prune-empty option that discards commits
  63  that do not change the contents.
  64
  65* "git grep -w" and "git grep" for fixed strings have been optimized.
  66
  67* "git log" and friends include HEAD to the set of starting points
  68  when --all is given.  This makes a difference when you are not on
  69  any branch.
  70
  71* "git ls-tree" learned --full-tree option that shows the path in full
  72  regardless of where in the work tree hierarchy the command was started.
  73
  74* "git mergetool" learned -y(--no-prompt) option to disable prompting.
  75
  76* "git rebase -i" can transplant a history down to root to elsewhere
  77  with --root option.
  78
  79* "git reset --merge" is a new mode that works similar to the way
  80  "git checkout" switches branches, taking the local changes while
  81  switching to another commit.
  82
  83(internal)
  84
  85
  86Fixes since v1.6.1
  87------------------
  88
  89All of the fixes in v1.6.1.X maintenance series are included in this
  90release, unless otherwise noted.
  91
  92* "git-add sub/file" when sub is a submodule incorrectly added the path to
  93  the superproject.
  94
  95* git-bundle did not exclude annotated tags even when a range given from the
  96  command line wanted to.
  97
  98* branch switching and merges had a silly bug that did not validate
  99  the correct directory when making sure an existing subdirectory is
 100  clean.
 101
 102--
 103exec >/var/tmp/1
 104O=v1.6.1.2-252-g8c95d3c
 105echo O=$(git describe master)
 106git shortlog --no-merges $O..master ^maint