diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-10-26 16:12:19 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-10-26 16:12:19 -0700 |
| commit | 716b64a73e65d7494dfb37631292fcbe8cb34cc0 (patch) | |
| tree | c697475e252e513b72e37243365d2bc9ea0cd5e7 /git-merge-resolve.sh | |
| parent | Merge branch 'rj/maint-t9159-svn-rev-notation' into maint-1.7.6 (diff) | |
| parent | remote: only update remote-tracking branch if updating refspec (diff) | |
| download | tgif-716b64a73e65d7494dfb37631292fcbe8cb34cc0.tar.xz | |
Merge branch 'mz/remote-rename' into maint-1.7.6
* mz/remote-rename:
remote: only update remote-tracking branch if updating refspec
remote rename: warn when refspec was not updated
remote: "rename o foo" should not rename ref "origin/bar"
remote: write correct fetch spec when renaming remote 'remote'
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions