delta/git.git, branch tq/git-ssh-command

git_connect: set ssh shell command in GIT_SSH_COMMAND

2014-11-10T16:55:10+00:00

It may be impractical to install a wrapper script for GIT_SSH
when additional parameters need to be passed. Provide an alternative
way of specifying a shell command to be run, including command line
arguments, by means of the GIT_SSH_COMMAND environment variable,
which behaves like GIT_SSH but is passed to the shell.

The special circuitry to modify parameters in the case of using
PuTTY's plink/tortoiseplink is activated only when using GIT_SSH;
in the case of using GIT_SSH_COMMAND, it is deliberately left up to
the user to make any required parameters adaptation before calling
the underlying ssh implementation.

Signed-off-by: Thomas Quinot 
Signed-off-by: Junio C Hamano

Git 2.2.0-rc1

2014-11-07T20:01:01+00:00

Signed-off-by: Junio C Hamano

Merge branch 'maint'

2014-11-06T18:52:51+00:00

* maint:
  docs/credential-store: s/--store/--file/

Merge branch 'nd/gitignore-trailing-whitespace'

2014-11-06T18:52:40+00:00

Documentation update.

* nd/gitignore-trailing-whitespace:
  gitignore.txt: fix spelling of "backslash"

Merge branch 'tm/line-log-first-parent'

2014-11-06T18:52:37+00:00

"git log --first-parent -L..." used to crash.

* tm/line-log-first-parent:
  line-log: fix crash when --first-parent is used

Merge branch 'jk/fetch-reflog-df-conflict'

2014-11-06T18:52:32+00:00

Corner-case bugfixes for "git fetch" around reflog handling.

* jk/fetch-reflog-df-conflict:
  ignore stale directories when checking reflog existence
  fetch: load all default config at startup

Merge branch 'rs/use-child-process-init-more'

2014-11-06T18:52:23+00:00

* rs/use-child-process-init-more:
  bundle: split out ref writing from bundle_create
  bundle: split out a helper function to compute and write prerequisites
  bundle: split out a helper function to create pack data
  use child_process_init() to initialize struct child_process variables

Merge branch 'jk/cache-tree-protect-from-broken-libgit2'

2014-11-06T18:51:35+00:00

The code to use cache-tree trusted the on-disk data too much
and fell into an infinite loop.

* jk/cache-tree-protect-from-broken-libgit2:
  cache-tree: avoid infinite loop on zero-entry tree

docs/credential-store: s/--store/--file/

2014-11-06T17:51:08+00:00

The option name "--store" was used early in development, but
never even made it into an applied patch, let alone a
released version of git. I forgot to update the matching
documentation at the time, though.

Noticed-by: Jesse Hopkins 
Signed-off-by: Jeff King 
Signed-off-by: Junio C Hamano

gitignore.txt: fix spelling of "backslash"

2014-11-04T22:44:47+00:00

Signed-off-by: Ben North 
Signed-off-by: Junio C Hamano