diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-01-20 12:22:54 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-20 12:22:54 -0800 |
| commit | 91d23be16767bf820401a6ba9a9397aa146c977a (patch) | |
| tree | 036b6ebb86c38e4eb3117d5892022a0959c8d626 /builtin-merge-ours.c | |
| parent | Merge branch 'dp/maint-1.6.5-fast-import-non-commit-tag' into maint-1.6.5 (diff) | |
| parent | bash completion: factor submodules into dirty state (diff) | |
| download | tgif-91d23be16767bf820401a6ba9a9397aa146c977a.tar.xz | |
Merge branch 'tr/maint-1.6.5-bash-prompt-show-submodule-changes' into maint-1.6.5
* tr/maint-1.6.5-bash-prompt-show-submodule-changes:
bash completion: factor submodules into dirty state
Diffstat (limited to 'builtin-merge-ours.c')
0 files changed, 0 insertions, 0 deletions