What's in git.git (Mar 2009, #03; Fri, 06)

Quite a many topics that have been scheduled for 'master' for some time have all graduated. With this pace we may be able to have a very short cycle for a change before 1.6.3 final ;-).

* The 'master' branch has these since the last announcement.

Arjen Laarhoven (2):
  Clean up use of ANSI color sequences
  builtin-branch.c: Rename branch category color names

Deskin Miller (1):
  add -i: revisit hunk on editor failure

Elijah Newren (1):
  Ensure proper setup of git_dir for git-hash-object

Felipe Contreras (3):
  config: Add new option to open an editor.
  git config: codestyle cleanups
  Add tests for git log --pretty, --format and --oneline.

Finn Arne Gangstad (1):
  Support "\" in non-wildcard exclusion entries

Jay Soffian (6):
  builtin-branch: improve output when displaying remote branches
  send-email: allow send-email to run outside a repo
  send-email: handle multiple Cc addresses when reading mbox message
  send-email: --suppress-cc improvements
  send-email: don't create temporary compose file until it is needed
  send-email: add --confirm option and configuration setting

Jeff King (4):
  valgrind: ignore ldso and more libz errors
  branch: clean up repeated strlen
  add basic branch display tests
  never fallback relative times to absolute

Jeremy White (2):
  Enable setting attach as the default in .gitconfig for git-format-patch.
  imap.preformattedHTML to tell Thunderbird to send non-flowed text

Johannes Schindelin (11):
  Add valgrind support in test scripts
  Valgrind support: check for more than just programming errors
  test-lib.sh: optionally output to test-results/$TEST.out, too
  t/Makefile: provide a 'valgrind' target
  Add a script to coalesce the valgrind outputs
  Tests: let --valgrind imply --verbose and --tee
  test-lib: avoid assuming that templates/ are in the GIT_EXEC_PATH
  valgrind: do not require valgrind 3.4.0 or newer
  Avoid segfault with 'git branch' when the HEAD is detached
  git config: trivial cleanup for editor action
  MinGW: 64-bit file offsets

John Tapsell (1):
  Documentation - More examples for git bisect

Junio C Hamano (4):
  git-blame: refactor code to emit "porcelain format" output
  blame: show "previous" information in --porcelain/--incremental format
  git-add -i/-p: learn to unwrap C-quoted paths
  Draft release notes: Carry forward the warning for behaviour changes

Marius Storm-Olsen (2):
  Add bare repository indicator for __git_ps1
  Fixup: Add bare repository indicator for __git_ps1

Nanako Shiraishi (3):
  Add --format that is a synonym to --pretty
  Give short-hands to --pretty=tformat:%formatstring
  Add --oneline that is a synonym to "--pretty=oneline --abbrev-commit"

SZEDER Gábor (1):
  rerere: remove duplicated functions

Sverre Rabbelier (1):
  Teach rebase to rebase even if upstream is up to date

Ted Pavlic (4):
  completion: For consistency, change "git rev-parse" to __gitdir calls
  completion: Use consistent if [...] convention, not "test"
  completion: Better __git_ps1 support when not in working directory
  completion: More fixes to prevent unbound variable errors

Teemu Likonen (1):
  bash completion: add --format= and --oneline options for "git log"

Junio C Hamano <gitster@pobox.com> writes:

People who have been following the 'next' branch during 1.6.2 rc period may already know these, but here is how the tip of 'master' looks like as of tonight (an excerpt from the draft release notes to 1.6.3).

Updates since v1.6.2 so far ---------------------------

(usability, bells and whistles)

* "--pretty=<style>" option to the log family of commands can now be
  spelled as "--format=<style>".  In addition, --format=%formatstring
  is a short-hand for --pretty=tformat:%formatstring.

* "--oneline" is a synonym for "--pretty=oneline --abbrev=commit".

* If you realize that you botched the patch when you are editing hunks
  with the 'edit' action in git-add -i/-p, you can abort the editor to
  tell git not to apply it.

* git-archive learned --output=<file> option.

* git-bisect shows not just the number of remaining commits whose goodness
  is unknown, but also shows the estimated number of remaining rounds.

* git-branch -r shows HEAD symref that points at a remote branch in
  interest of each tracked remote repository.

* git-config learned -e option to open an editor to edit the config file
  directly.

* git-format-patch can be told to use attachment with a new configuration,
  format.attach.

* git-imap-send learned to work around Thunderbird's inability to easily
  disable format=flowed with a new configuration, imap.preformattedHTML.

* git-rebase can be told to rebase the series even if your branch is a
  descendant of the commit you are rebasing onto with --force-rebase
  option.

* git-send-email learned --confirm option to review the Cc: list before
  sending the messages out.

(developers)

* Test scripts can be run under valgrind.

Fixes since v1.6.2 so far -------------------------

All of the fixes in v1.6.2.X maintenance series are included in this release, unless otherwise noted.

Here are fixes that this release has, but have not been backported to v1.6.2.X series.

* .gitignore learned to handle backslash as a quoting mechanism for
  comment introduction character "#" (backport by merging dd482ee if
  needed).

* timestamp output in --date=relative mode used to display timestamps that
  are long time ago in the default mode; it now uses "N years M months
  ago", and "N years ago" (backport by picking 10edf37 if needed).

* git-add -i/-p now works with non-ASCII pathnames (backport by picking
  8851f48 if needed).

* "git hash-object -w" did not read from the configuration file from the
  correct .git directory (backport by merging 272459a if needed).

* git-send-email learned to correctly handle multiple Cc: addresses
  (backport by merging afe756c if needed).