diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-06-12 22:55:44 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-06-12 22:55:44 -0700 |
| commit | dc92cc20f8dcfefcd5d79e8550736bcc437ea2e4 (patch) | |
| tree | 7d38aa79d84fe7635876ccfaacedcfe3886c7b74 /git-mergetool.sh | |
| parent | d8933f013a66cc1deadf83a9c24eccb6fee78a35 (diff) | |
| parent | 8b7d4e738ee5489fecb5c4a55d14884b09e0dc6d (diff) | |
| download | git-dc92cc20f8dcfefcd5d79e8550736bcc437ea2e4.tar.gz | |
Merge branch 'om/remote-fix'
* om/remote-fix:
"remote prune": be quiet when there is nothing to prune
remote show: list tracked remote branches with -n
remote prune: print the list of pruned branches
builtin-remote: split show_or_prune() in two separate functions
remote show: fix the -n option
Diffstat (limited to 'git-mergetool.sh')
0 files changed, 0 insertions, 0 deletions