diff options
author | Junio C Hamano <gitster@pobox.com> | 2012-02-27 15:33:33 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2012-02-27 15:33:33 -0800 |
commit | 67f8d5b87d8ec3dcdb311f31b534332b74c93142 (patch) | |
tree | 6d77a87d8ca5045d0e539e3444b25be830115cd4 /merge-file.h | |
parent | e22c522730b0fc1dd2a1f12b6e508c5fb2e0fe6c (diff) | |
parent | ca5bc9e61fb26969c9b028c9b853af109f9f00c5 (diff) | |
download | git-67f8d5b87d8ec3dcdb311f31b534332b74c93142.tar.gz |
Merge branch 'pj/remote-set-branches-usage-fix' into maint
* pj/remote-set-branches-usage-fix:
remote: fix set-branches usage and documentation
Conflicts:
builtin/remote.c
Diffstat (limited to 'merge-file.h')
0 files changed, 0 insertions, 0 deletions