diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-07-19 09:45:37 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-07-19 09:45:37 -0700 |
| commit | 0591c0a5be7d58dfe2c69c8a81b2cebbb0337320 (patch) | |
| tree | 78bdfd99a808beaedbdb9bb055e2e693b0dfaa68 /t/t3502-cherry-pick-merge.sh | |
| parent | Merge branch 'jk/archive-tar-filter' (diff) | |
| parent | submodule add: always initialize .git/config entry (diff) | |
| download | tgif-0591c0a5be7d58dfe2c69c8a81b2cebbb0337320.tar.xz | |
Merge branch 'jc/submodule-sync-no-auto-vivify'
* jc/submodule-sync-no-auto-vivify:
submodule add: always initialize .git/config entry
submodule sync: do not auto-vivify uninteresting submodule
Conflicts:
git-submodule.sh
Diffstat (limited to 't/t3502-cherry-pick-merge.sh')
0 files changed, 0 insertions, 0 deletions