Signed-off-by: Michael Schubert <mschub@elegosoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

When we use -c, -C, or --amend, we are trying one of two things: using the
source as a template or modifying a commit with corrections.

When these options are used, the authorship and timestamp recorded in the
newly created commit are always taken from the original commit.  This is
inconvenient when we just want to borrow the commit log message or when
our change to the code is so significant that we should take over the
authorship (with the blame for bugs we introduce, of course).

The new --reset-author option is meant to solve this need by regenerating
the timestamp and setting the committer as the new author.

Signed-off-by: Erick Mattos <erick.mattos@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

This reverts commit 0cc5691a8b05a7eabdeef520c94b1bb3bcac7874.

There is not enough justification for doing this.  We do not update
things in .git/branches and .git/remotes anymore, but still do read
information from there and will keep doing so.

Besides, this breaks quite a lot of tests in t55?? series.

* js/diff-verbose-submodule:
  add tests for git diff --submodule
  Add the --submodule option to the diff option family

* jc/checkout-auto-track:
  git checkout --no-guess
  DWIM "git checkout frotz" to "git checkout -b frotz origin/frotz"
  check_filename(): make verify_filename() callable without dying

* jn/show-normalized-refs:
  check-ref-format: simplify --print implementation
  git check-ref-format --print
  Add tests for git check-ref-format

Conflicts:
	Documentation/git-check-ref-format.txt

* jc/maint-1.6.3-graft-trailing-space:
  info/grafts: allow trailing whitespaces at the end of line

* ak/bisect-reset-to-switch:
  bisect reset: Allow resetting to any commit, not just a branch

* tr/maint-roff-quote:
  Quote ' as \(aq in manpages