Documentation / RelNotes / 1.7.6.txton commit Merge branch 'jm/mergetool-submodules' (59b2389)
   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 * When an object "$tree:$path" does not exist, if $path does exist in the
  13   subtree of $tree that corresponds to the subdirectory the user is in,
  14   git now suggests using "$tree:./$path" in addition to the advice to use
  15   the full path from the root of the working tree.
  16
  17 * "git blame" learned "--abbrev[=<n>]" option to control the minimum
  18   number of hexdigits shown for commit object names.
  19
  20 * "git clean" used to fail on an empty directory that is not readable,
  21   even though rmdir(2) could remove such a directory.  Now we attempt it
  22   as the last resort.
  23
  24 * "git diff -C -C" used to disable the rename detection entirely when
  25   there are too many copy candidate paths in the tree; now it falls
  26   back to "-C" when doing so would keep the copy candidate paths
  27   under the rename detection limit.
  28
  29 * "git format-patch" learned "--quiet" option to suppress the output of
  30   the names of generated files.
  31
  32 * "git log" and friends learned a new "--notes" option to replace the
  33   "--show-notes" option.  Unlike "--show-notes", "--notes=<ref>" does
  34   not imply showing the default notes.
  35
  36 * "git merge" learned "-" as a short-hand for "the previous branch", just
  37   like the way "git checkout -" works.
  38
  39 * "git pack-object" now takes core.bigfilethreashold into account, just
  40   like fast-imoprt does.
  41
  42 * "git reflog" allows options like "--format=.." to be given.
  43
  44 * "git stash apply" can now apply to a working tree with changes as long
  45   as there is no overlapping change as the stash being applied.
  46
  47 * "git submodule update" learned "--force" option to get rid of local
  48   changes in submodules and replace them with the up-to-date version.
  49
  50 * "git stash apply @{99999}" now is diagnosed as an error, unless you
  51   really have that many stash entries.
  52
  53Also contains various documentation updates.
  54
  55
  56Fixes since v1.7.5
  57------------------
  58
  59Unless otherwise noted, all the fixes in 1.7.5.X maintenance track are
  60included in this release.
  61
  62 * "git config" used to choke with an insanely long line.
  63   (merge ef/maint-strbuf-init later)
  64
  65 * The "--dirstat" option of "diff" family of commands used to totally
  66   ignore a change that only rearranged lines within a file.  Such a
  67   change now counts as at least a minimum but non zero change.
  68
  69 * The "--dirstat" option of "diff" family of commands used to use the
  70   pathname in the original, instead of the pathname in the result,
  71   when renames are involved.
  72   (merge jh/dirstat for the above two later)
  73
  74 * "diff -M --cached" used to use unmerged path as a possible rename
  75   source candidate, which made no sense.
  76   (merge mz/maint-rename-unmerged later)
  77
  78 * "git format-patch" when run with "--quiet" option used to produce a
  79   nonsense result that consists of alternating empty output.
  80   (merge early part of cn/format-patch-quiet later)
  81
  82 * "git stash -p --no-keep-index" and "git stash --no-keep-index -p" now
  83   mean the same thing.
  84   (merge dm/stash-k-i-p later)
  85
  86 * "git upload-pack" (hence "git push" over git native protocol) had a
  87   subtle race condition that could lead to a deadlock.
  88   (merge jk/maint-upload-pack-shallow later)
  89
  90---
  91exec >/var/tmp/1
  92echo O=$(git describe master)
  93O=v1.7.5-184-g23f536c
  94git shortlog --no-merges ^maint ^$O master