delta/git.git, branch kw/rebase-progress

rebase: turn on progress option by default for format-patch

2017-08-14T21:09:46+00:00

Pass the "--progress" option to format-patch when the standard error
stream is connected to the terminal and "--quiet" is not given.

Signed-off-by: Kevin Willford 
Signed-off-by: Junio C Hamano

format-patch: have progress option while generating patches

2017-08-14T21:09:45+00:00

When generating patches for the rebase command, if the user does
not realize the branch they are rebasing onto is thousands of
commits different, there is no progress indication after initial
rewinding message.

The progress meter as presented in this patch assumes the thousands of
patches to have a fine granularity as well as assuming to require all
the same amount of work/time for each, such that a steady progress bar
is achieved.

We do not want to estimate the time for each patch based e.g.
on their size or number of touched files (or parents) as that is too
expensive for just a progress meter.

This patch allows a progress option to be passed to format-patch
so that the user can be informed the progress of generating the
patch.  This option is then used by the rebase command when
calling format-patch.

Signed-off-by: Kevin Willford 
Signed-off-by: Junio C Hamano

Merge tag 'v2.14.1'

2017-08-04T19:45:17+00:00

Start post 2.14 cycle

2017-08-04T19:44:55+00:00

Signed-off-by: Junio C Hamano

Git 2.14.1

2017-08-04T19:41:54+00:00

Signed-off-by: Junio C Hamano

Merge tag 'v2.13.5' into maint

2017-08-04T19:40:37+00:00

Git 2.14

2017-08-04T16:31:12+00:00

Signed-off-by: Junio C Hamano

Merge branch 'ah/patch-id-doc'

2017-08-04T16:29:15+00:00

Docfix.

* ah/patch-id-doc:
  doc: remove unsupported parameter from patch-id

Merge branch 'as/diff-options-grammofix'

2017-08-04T16:29:14+00:00

A grammofix.

* as/diff-options-grammofix:
  diff-options doc: grammar fix

Merge tag 'l10n-2.14.0-rnd2' of git://github.com/git-l10n/git-po

2017-08-02T17:52:33+00:00

l10n for Git 2.14.0 round 2

* tag 'l10n-2.14.0-rnd2' of git://github.com/git-l10n/git-po:
  l10n: zh_CN: review for git v2.14.0 l10n
  l10n: ko.po: Update Korean translation
  l10n: zh_CN: for git v2.14.0 l10n round 2
  l10n: de.po: various fixes in German translation
  l10n: ru.po: update Russian translation
  l10n: fr.po v2.14.0 rnd 2
  l10n: fr.po Fix some french typos
  l10n: fr.po Fix typo
  l10n: fr.po Fix some translations
  l10n: de.po: update German translation
  l10n: vi.po (3213t): Updated 9 new strings
  l10n: Update Catalan translation
  l10n: bg.po: Updated Bulgarian translation (3213t)