diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-06-30 15:39:35 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-06-30 15:39:35 -0700 |
| commit | d9857bfd4de097d662d40481664ef30577f120f5 (patch) | |
| tree | 4f1b99658cbd80b5b5a3c4ee9e169a46260d503d /builtin/merge.c | |
| parent | Sync with 1.8.3.2 (diff) | |
| parent | submodule: drop the top-level requirement (diff) | |
| download | tgif-d9857bfd4de097d662d40481664ef30577f120f5.tar.xz | |
Merge branch 'jk/submodule-subdirectory-ok'
Allow various subcommands of "git submodule" to be run not from the
top of the working tree of the superproject.
* jk/submodule-subdirectory-ok:
submodule: drop the top-level requirement
rev-parse: add --prefix option
submodule: show full path in error message
t7403: add missing && chaining
t7403: modernize style
t7401: make indentation consistent
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions