summaryrefslogtreecommitdiff
path: root/Documentation/git-mergetool--lib.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-06-11 13:30:24 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-06-11 13:30:24 -0700
commit8d3b97ae51a0fd77443b3b71a169858e28d12261 (patch)
treee4c7d028c5d9cfc27d333d1c2d8947826bc3948f /Documentation/git-mergetool--lib.txt
parentMerge branch 'rj/mingw-cygwin' (diff)
parentremote-hg: add support for --force (diff)
downloadtgif-8d3b97ae51a0fd77443b3b71a169858e28d12261.tar.xz
Merge branch 'fc/remote-hg'
* fc/remote-hg: (50 commits) remote-hg: add support for --force remote-hg: add support for --dry-run remote-hg: check if a fetch is needed remote-hg: trivial cleanup remote-helpers: improve marks usage remote-hg: add check_push() helper remote-hg: add setup_big_push() helper remote-hg: remove files before modifications remote-hg: improve lightweight tag author remote-hg: use remote 'default' not local one remote-hg: improve branch listing remote-hg: simplify branch_tip() remote-hg: check diverged bookmarks remote-hg: pass around revision refs remote-hg: implement custom checkheads() remote-hg: implement custom push() remote-hg: only update necessary revisions remote-hg: force remote bookmark push selectively remote-hg: reorganize bookmark handling remote-hg: add test for failed double push ...
Diffstat (limited to 'Documentation/git-mergetool--lib.txt')
0 files changed, 0 insertions, 0 deletions