Documentation / RelNotes / 1.7.3.txton commit mergetool-lib: make the three-way diff the default for vim/gvim (0008669)
   1Git v1.7.3 Release Notes (draft)
   2================================
   3
   4Updates since v1.7.2
   5--------------------
   6
   7 * git-gui got various updates and a new maintainer, Pat Thoyts.
   8
   9 * Gitweb allows its configuration to change per each request; it used to
  10   read the configuration once upon startup.
  11
  12 * When git finds a corrupt object, it now reports the file that contains
  13   it.
  14
  15 * "git checkout -B <it>" is a shorter way to say "git branch -f <it>"
  16   followed by "git checkout <it>".
  17
  18 * When "git checkout" or "git merge" refuse to proceed in order to
  19   protect local modification to your working tree, they used to stop
  20   after showing just one path that might be lost.  They now show all,
  21   in a format that is easier to read.
  22
  23 * "git clean" learned "-e" ("--exclude") option.
  24
  25 * Hunk headers produced for C# files by "git diff" and friends show more
  26   relevant context than before.
  27
  28 * diff.ignoresubmodules configuration variable can be used to squelch the
  29   differences in submodules reported when running commands (e.g. "diff",
  30   "status", etc.) at the superproject level.
  31
  32 * http.useragent configuration can be used to lie who you are to your
  33   restrictive firewall.
  34
  35 * "git rebase --strategy <s>" learned "-X" option to pass extra options
  36   that are understood by the chosen merge strategy.
  37
  38 * "git rebase -i" learned "exec" that you can insert into the insn sheet
  39   to run a command between its steps.
  40
  41 * "git rebase" between branches that have many binary changes that do
  42   not conflict should be faster.
  43
  44 * "git rebase -i" peeks into rebase.autosquash configuration and acts as
  45   if you gave --autosquash from the command line.
  46
  47
  48Also contains various documentation updates.
  49
  50
  51Fixes since v1.7.2
  52------------------
  53
  54All of the fixes in v1.7.2.X maintenance series are included in this
  55release, unless otherwise noted.
  56
  57 * "git merge -s recursive" (which is the default) did not handle cases
  58   where a directory becomes a file (or vice versa) very well.
  59
  60 * "git fetch" and friends were accidentally broken for url with "+" in
  61   its path, e.g. "git://git.gnome.org/gtk+".
  62
  63 * "git fetch $url" (i.e. without refspecs) was broken for quite some
  64   time, if the current branch happen to be tracking some remote.
  65
  66 * "git note remove" created unnecessary extra commit when named object
  67   did not have any note to begin with.
  68
  69 * "git -c foo=bar subcmd" did not work well for subcmd that is not
  70   implemented as a built-in command.
  71
  72---
  73exec >/var/tmp/1
  74echo O=$(git describe master)
  75O=v1.7.3-rc0
  76git shortlog --no-merges $O..master ^maint
  77exit 0
  78
  79What did we want to do with...
  80
  811e3d411 (Enable custom schemes for column colors in the graph API, 2010-07-13)