diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-01-05 23:41:09 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-01-05 23:41:09 -0800 |
| commit | 76523cac2688b1c9e8b56bd2c1a7a0ae1370e905 (patch) | |
| tree | 3fc94c5cfbe26194f841db0a2e7aedd2f4380cb8 /git-mergetool.sh | |
| parent | Merge branch 'mh/unify-xml-in-imap-send-and-http-push' (diff) | |
| parent | fast-export: make sure updated refs get updated (diff) | |
| download | tgif-76523cac2688b1c9e8b56bd2c1a7a0ae1370e905.tar.xz | |
Merge branch 'fc/fast-export-fixes'
Various updates to fast-export used in the context of the remote
helper interface.
* fc/fast-export-fixes:
fast-export: make sure updated refs get updated
fast-export: don't handle uninteresting refs
fast-export: fix comparison in tests
fast-export: trivial cleanup
remote-testgit: implement the "done" feature manually
remote-testgit: report success after an import
remote-testgit: exercise more features
remote-testgit: cleanup tests
remote-testgit: remove irrelevant test
remote-testgit: remove non-local functionality
Add new simplified git-remote-testgit
Rename git-remote-testgit to git-remote-testpy
remote-helpers: fix failure message
remote-testgit: fix direction of marks
fast-export: avoid importing blob marks
Diffstat (limited to 'git-mergetool.sh')
0 files changed, 0 insertions, 0 deletions