summaryrefslogtreecommitdiff
path: root/Documentation/git-mergetool.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-10-26 23:12:19 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-10-26 23:12:19 (GMT)
commit716b64a73e65d7494dfb37631292fcbe8cb34cc0 (patch)
treec697475e252e513b72e37243365d2bc9ea0cd5e7 /Documentation/git-mergetool.txt
parent8371e91463d8d9507244952f1652f2c1e0779a84 (diff)
parentb52d00aedeb94f12a16afcef1bb33c989f9b4105 (diff)
downloadgit-716b64a73e65d7494dfb37631292fcbe8cb34cc0.zip
git-716b64a73e65d7494dfb37631292fcbe8cb34cc0.tar.gz
git-716b64a73e65d7494dfb37631292fcbe8cb34cc0.tar.bz2
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 'Documentation/git-mergetool.txt')
0 files changed, 0 insertions, 0 deletions