delta/git.git/builtin, branch jn/scripts-updates

Merge branch 'nd/literal-pathspecs'

2013-11-18T22:31:29+00:00

Fixes a regression on 'master' since v1.8.4.

* nd/literal-pathspecs:
  pathspec: stop --*-pathspecs impact on internal parse_pathspec() uses

Merge branch 'jx/branch-vv-always-compare-with-upstream'

2013-11-18T20:24:49+00:00

Hot-fix for a regression.

* jx/branch-vv-always-compare-with-upstream:
  branch: fix --verbose output column alignment

branch: fix --verbose output column alignment

2013-11-18T19:24:08+00:00

Commit f2e0873 (branch: report invalid tracking branch as gone) removed
an early return from fill_tracking_info() in the path taken when 'git
branch -v' lists a branch in sync with its upstream. This resulted in an
unconditionally added space in front of the subject line:

    $ git branch -v
    * master f5eb3da  commit pushed to upstream
      topic  f935eb6 unpublished topic

Instead, only add the trailing space if a decoration have been added.

To catch this kind of whitespace breakage in the tests, be a bit less
smart when filtering the output through sed.

Signed-off-by: Torstein Hegge 
Signed-off-by: Junio C Hamano

Merge branch 'fc/trivial'

2013-11-06T22:34:43+00:00

A random collection of style fixes and minor doc updates.

* fc/trivial:
  setup: trivial style fixes
  run-command: trivial style fixes
  diff: trivial style fix
  revision: trivial style fixes
  pretty: trivial style fix
  describe: trivial style fixes
  transport-helper: trivial style fix
  sha1-name: trivial style cleanup
  branch: trivial style fix
  revision: add missing include
  doc/pull: clarify the illustrations
  t: replace pulls with merges
  merge: simplify ff-only option

Merge branch 'jk/reset-p-current-head-fix'

2013-11-01T14:38:49+00:00

"git reset -p HEAD" has codepath to special case it from resetting
to contents of other commits, but recent change broke it.

* jk/reset-p-current-head-fix:
  reset: pass real rev name to add--interactive
  add-interactive: handle unborn branch in patch mode

Merge branch 'jk/for-each-ref-skip-parsing'

2013-11-01T14:38:41+00:00

* jk/for-each-ref-skip-parsing:
  for-each-ref: avoid loading objects to print %(objectname)

Merge branch 'jl/submodule-mv'

2013-11-01T14:38:27+00:00

Moving a regular file in a repository with a .gitmodules file was
producing a warning 'Could not find section in .gitmodules where
path='.

* jl/submodule-mv:
  mv: Fix spurious warning when moving a file in presence of submodules

diff: trivial style fix

2013-10-31T20:48:09+00:00

Signed-off-by: Felipe Contreras 
Signed-off-by: Junio C Hamano

describe: trivial style fixes

2013-10-31T20:47:35+00:00

Signed-off-by: Felipe Contreras 
Signed-off-by: Junio C Hamano

branch: trivial style fix

2013-10-31T20:46:55+00:00

Signed-off-by: Felipe Contreras 
Signed-off-by: Junio C Hamano