delta/git.git, branch ls/editor-waiting-message

launch_editor(): indicate that Git waits for user input

2017-12-07T18:10:19+00:00

When a graphical GIT_EDITOR is spawned by a Git command that opens
and waits for user input (e.g. "git rebase -i"), then the editor window
might be obscured by other windows. The user might be left staring at
the original Git terminal window without even realizing that s/he needs
to interact with another window before Git can proceed. To this user Git
appears hanging.

Print a message that Git is waiting for editor input in the original
terminal and get rid of it when the editor returns, if the terminal
supports erasing the last line.  Also, make sure that our message is
terminated with a whitespace so that any message the editor may show
upon starting up will be kept separate from our message.

Power users might not want to see this message or their editor might
already print such a message (e.g. emacsclient). Allow these users to
suppress the message by disabling the "advice.waitingForEditor" config.

The standard advise() function is not used here as it would always add
a newline which would make deleting the message harder.

Helped-by: Junio C Hamano 
Signed-off-by: Lars Schneider 
Signed-off-by: Junio C Hamano

refactor "dumb" terminal determination

2017-12-04T17:38:30+00:00

Move the code to detect "dumb" terminals into a single location. This
avoids duplicating the terminal detection code yet again in a subsequent
commit.

Signed-off-by: Lars Schneider 
Signed-off-by: Junio C Hamano

Start preparation for 2.15.1

2017-11-15T03:05:22+00:00

Signed-off-by: Junio C Hamano

Merge branch 'ks/mailmap' into maint

2017-11-15T03:05:04+00:00

* ks/mailmap:
  mailmap: use Kaartic Sivaraam's new address

Merge branch 'jm/relnotes-2.15-typofix' into maint

2017-11-15T03:05:04+00:00

Typofix.

* jm/relnotes-2.15-typofix:
  fix typos in 2.15.0 release notes

Merge branch 'cn/diff-indent-no-longer-is-experimental' into maint

2017-11-15T03:05:04+00:00

Doc update.

* cn/diff-indent-no-longer-is-experimental:
  diff: --indent-heuristic is no longer experimental

Merge branch 'js/mingw-redirect-std-handles' into maint

2017-11-15T03:05:03+00:00

MinGW updates.

* js/mingw-redirect-std-handles:
  mingw: document the standard handle redirection
  mingw: optionally redirect stderr/stdout via the same handle
  mingw: add experimental feature to redirect standard handles

Merge branch 'js/wincred-empty-cred' into maint

2017-11-15T03:05:03+00:00

MinGW updates.

* js/wincred-empty-cred:
  wincred: handle empty username/password correctly
  t0302: check helper can handle empty credentials

Merge branch 'js/mingw-full-version-in-resources' into maint

2017-11-15T03:05:03+00:00

MinGW updates.

* js/mingw-full-version-in-resources:
  mingw: include the full version information in the resources

Merge branch 'dk/libsecret-unlock-to-load-fix' into maint

2017-11-15T03:05:02+00:00

The credential helper for libsecret (in contrib/) has been improved
to allow possibly prompting the end user to unlock secrets that are
currently locked (otherwise the secrets may not be loaded).

* dk/libsecret-unlock-to-load-fix:
  credential-libsecret: unlock locked secrets