Documentation / RelNotes / 1.7.6.txton commit Merge branch 'maint' (be0dca3)
   1Git v1.7.6 Release Notes (draft)
   2========================
   3
   4Updates since v1.7.5
   5--------------------
   6
   7 * Various git-svn updates.
   8
   9 * Clean-up of the C part of i18n (but not l10n---please wait)
  10   continues.
  11
  12 * "git blame" learned "--abbrev[=<n>]" option to control the minimum
  13   number of hexdigits shown for commit object names.
  14
  15 * "git diff -C -C" used to disable the rename detection entirely when
  16   there are too many copy candidate paths in the tree; now it falls
  17   back to "-C" when doing so would keep the copy candidate paths
  18   under the rename detection limit.
  19
  20 * "git format-patch" learned "--quiet" option to suppress the output of
  21   the names of generated files.
  22
  23 * "git log" and friends learned a new "--notes" option to replace the
  24   "--show-notes" option.  Unlike "--show-notes", "--notes=<ref>" does
  25   not imply showing the default notes.
  26
  27 * "git merge" learned "-" as a short-hand for "the previous branch", just
  28   like the way "git checkout -" works.
  29
  30 * "git rev-list --count" used with "--cherry-mark" counts the cherry-picked
  31   commits separately, producing more a useful output.
  32
  33 * "git submodule update" learned "--force" option to get rid of local
  34   changes in submodules and replace them with the up-to-date version.
  35
  36 * Compressed tarball gitweb generates is made without the timestamp of
  37   the tarball generation; snapshot from the same tree should result in
  38   a same tarball.
  39
  40Also contains various documentation updates.
  41
  42
  43Fixes since v1.7.5
  44------------------
  45
  46Unless otherwise noted, all the fixes in 1.7.5.X maintenance track are
  47included in this release.
  48
  49 * "git config" used to choke with an insanely long line.
  50   (merge ef/maint-strbuf-init later)
  51
  52 * "diff -M --cached" used to use unmerged path as a possible rename
  53   source candidate, which made no sense.
  54   (merge mz/maint-rename-unmerged later)
  55
  56 * "git format-patch" when run with "--quiet" option used to produce a
  57   nonsense result that consists of alternating empty output.
  58   (merge early part of cn/format-patch-quiet later)
  59
  60 * "git format-patch" did not quote RFC822 special characters in the
  61   email address (e.g From: Junio C. Hamano <jch@example.com>, not
  62   From: "Junio C. Hamano" <jch@example.com>).
  63   (merge jk/format-patch-quote-special-in-from later)
  64
  65 * "git mergetool" did not handle conflicted submoudules gracefully.
  66   (merge jm/mergetool-submodules later)
  67
  68 * "git stash -p --no-keep-index" and "git stash --no-keep-index -p" now
  69   mean the same thing.
  70   (merge dm/stash-k-i-p later)
  71
  72 * "git upload-pack" (hence "git push" over git native protocol) had a
  73   subtle race condition that could lead to a deadlock.
  74   (merge jk/maint-upload-pack-shallow later)
  75
  76---
  77exec >/var/tmp/1
  78echo O=$(git describe master)
  79O=v1.7.5-184-g23f536c
  80git shortlog --no-merges ^maint ^$O master