git-fast-import(1): remove duplicate '--done' option

On Sat, Jan 05, 2013 at 04:06:52PM +0000, John Keeping wrote:
The '--done' option to git-fast-import is documented twice in its manual
page.  Combine the best bits of each description, keeping the location
of the instance that was added first.

Signed-off-by: John Keeping <john@keeping.me.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Merge branch 'jk/pathspec-literal' into next

Will merge to 'next' and 'master' as a quick "oops" fix.

* jk/pathspec-literal:
  t6130-pathspec-noglob: Windows does not allow a file named "f*"
Merge branch 'jk/maint-fast-import-doc-dedup-done' into next

Will merge to 'next' and 'master' as a quick "oops" fix.

The "logical order" reorganization can come after that is done and
can cook longer in 'next'.

* jk/maint-fast-import-doc-dedup-done:
  git-fast-import(1): remove duplicate '--done' option
Merge branch 'tb/test-t9020-no-which' into next

* tb/test-t9020-no-which:
  t9020: which is not portable
Merge branch 'tb/test-t9810-no-sed-i' into next

* tb/test-t9810-no-sed-i:
  t9810: Do not use sed -i
Merge branch 'ta/remove-stale-translated-tut' into next

Remove a translation of a document that was left stale.

* ta/remove-stale-translated-tut:
  Remove Documentation/pt_BR/gittutorial.txt
Merge branch 'as/test-name-alias-uniquely' into next

A few short-and-bland aliases used in the tests were interfering
with git-custom command in user's $PATH.

* as/test-name-alias-uniquely:
  Use longer alias names in subdirectory tests
Merge branch 'jc/maint-fmt-merge-msg-no-edit-lose-credit' into next

Stop spending cycles to compute information to be placed on
commented lines in "merge --no-edit".

* jc/maint-fmt-merge-msg-no-edit-lose-credit:
  merge --no-edit: do not credit people involved in the side branch
Merge branch 'er/python-version-requirements' into next

Some python scripts we ship cannot be run with old versions of the
interpreter.

* er/python-version-requirements:
  Add checks to Python scripts for version dependencies.
Merge branch 'kb/maint-bundle-doc' into next

* kb/maint-bundle-doc:
  Documentation: full-ness of a bundle is significant for cloning
  Documentation: correct example restore from bundle
Merge branch 'jn/less-reconfigure' into next

When autoconf is used, any build on a different commit always ran
"config.status --recheck" even when unnecessary.

* jn/less-reconfigure:
  build: do not automatically reconfigure unless configure.ac changed
Merge branch 'os/gitweb-highlight-uncaptured' into next

The code to sanitize control characters before passing it to
"highlight" filter lost known-to-be-safe control characters by
mistake.

* os/gitweb-highlight-uncaptured:
  gitweb: fix error in sanitize when highlight is enabled
Merge branch 'jc/submittingpatches' into next

Streamline the document and update with a few e-mail addresses the
patches should be sent to.

* jc/submittingpatches:
  SubmittingPatches: give list and maintainer addresses
  SubmittingPatches: remove overlong checklist
  SubmittingPatches: mention subsystems with dedicated repositories
  SubmittingPatches: who am I and who cares?
Merge branch 'jk/enable-test-lint-by-default' into next

We had two simple and quick tests to catch common mistakes when
writing test scripts, but they weren't run by default when running
tests.

* jk/enable-test-lint-by-default:
  tests: turn on test-lint by default
Merge branch 'nd/maint-branch-desc-doc' into next

Teach various forms of "format-patch" command line to identify what
branch the patches are taken from, so that the branch description
is picked up in more cases.

* nd/maint-branch-desc-doc:
  format-patch: pick up branch description when no ref is specified
  format-patch: pick up correct branch name from symbolic ref
  t4014: a few more tests on cover letter using branch description
  branch: delete branch description if it's empty
  config.txt: a few lines about branch.<name>.description
Merge branch 'jc/format-patch-reroll' into next

Teach "format-patch -v4" to prefix "v4-" to the names of its output
files for the fourth iteration of a patch series, to make it easier
for the submitter to keep separate copies for iterations.

* jc/format-patch-reroll:
  format-patch: give --reroll-count a short synonym -v
  format-patch: document and test --reroll-count
  format-patch: add --reroll-count=$N option
  get_patch_filename(): split into two functions
  get_patch_filename(): drop "just-numbers" hack
  get_patch_filename(): simplify function signature
  builtin/log.c: stop using global patch_suffix
  builtin/log.c: drop redundant "numbered_files" parameter from make_cover_letter()
  builtin/log.c: drop unused "numbered" parameter from make_cover_letter()
Merge branch 'ap/merge-stop-at-prepare-commit-msg-failure' into next

"git merge" started calling prepare-commit-msg hook like "git
commit" does some time ago, but forgot to pay attention to the exit
status of the hook.  t7505 may want a general clean-up but that is
a different topic.

* ap/merge-stop-at-prepare-commit-msg-failure:
  merge: Honor prepare-commit-msg return code
Merge branch 'aw/rebase-am-failure-detection' into next

Save output from format-patch command in a temporary file, just in
case it aborts, to give a better failure-case behaviour.

* aw/rebase-am-failure-detection:
  rebase: Handle cases where format-patch fails
Merge branch 'mz/pick-unborn' into next

Allows "git cherry-pick $commit" when you do not have any history
behind HEAD yet.

* mz/pick-unborn:
  learn to pick/revert into unborn branch
  tests: move test_cmp_rev to test-lib-functions
Merge branch 'er/stop-recommending-parsecvs' into next

Stop recommending a defunct third-party software.

* er/stop-recommending-parsecvs:
  Remove the suggestion to use parsecvs, which is currently broken.