575 Commits (e301bfeea19e284344868840793c58d2e7529c74)

Author SHA1 Message Date
Simon Hausmann f1e9b5345e Use sets.Set() instead of set() to run also with older versions of Python. 18 years ago
Simon Hausmann 0563a4538a Make it possible to specify the p4 changes to import through a text file (for debugging) and made various improvements to the branch/merge heuristic detection. 18 years ago
Junio C Hamano 4cc41a16c1 Remove git-diff-stages. 18 years ago
Junio C Hamano 207dfa0791 Remove git-resolve. 18 years ago
Aneesh Kumar K.V 07fef5fc15 blameview: Move the commit info to a pane below the blame window. 18 years ago
Simon Hausmann 930d3cc94e When trying to map p4 integrations to git merges just record it as a single merge with the newest p4 change as secondary parent. 18 years ago
Simon Hausmann 77083daac7 Set git fast-import marks for every imported change for future use. 18 years ago
Simon Hausmann 53b03239aa After marking a p4 branch as merged don't ever merge it in git again. 18 years ago
Simon Hausmann dcacf8b447 More fixes in heuristic p4 branch detection based on common path components. 18 years ago
Simon Hausmann 766887e110 Started work on p4 branch detection (experimental!). 18 years ago
Simon Hausmann 44b3add651 Code cleanups. 18 years ago
Michael Loeffler d63ea11594 import-tars: brown paper bag fix for file mode. 18 years ago
Shawn O. Pearce c6ec3b13b8 bash: Hide git-fast-import. 18 years ago
Simon Hausmann 12d04ca7da Cleanups, remove unused variable. 18 years ago
Simon Hausmann fc21f8a1da Create lightweight git tags (using the "reset" trick) for the incremental import instead of full-blown ones. Also fix parsing the output of git name-rev for figuring out the last imported p4 change number. 18 years ago
Simon Hausmann f7d63b0c99 Added a little helper script to remove unused tags from the perforce import. 18 years ago
Simon Hausmann fe2193183a Changed the default git import branch from "p4" to "master". 18 years ago
Simon Hausmann 8718f3ec9a Avoid the excessive use of git tags for every perforce change and instead just create one git tag for the last imported change. 18 years ago
Simon Hausmann b41507a427 Minor code cleanups. 18 years ago
Nicolas Pitre ad34a028c1 remove mailmap.linux 18 years ago
David Kågedal d2589855df git-blame.el: Autoupdate while editing 18 years ago
David Kågedal 96df551cb8 git-blame.el: Doc fixes and cleanup 18 years ago
David Kågedal f0f39bb4c4 git-blame.el: blame unsaved changes 18 years ago
David Kågedal fa88211600 git-blame.el: improve color handling 18 years ago
David Kågedal 9f85fb324d Handle uncommitted changes and cache descriptions 18 years ago
Jakub Narebski f6f125fbaa git-blame: Change installation instructions 18 years ago
Jakub Narebski b52ba1a5d6 git-blame: Add Emacs Lisp file headers and GNU GPL boilerplate 18 years ago
Simon Hausmann 20c7bc76b9 Added a little helper script to debug the output of the p4 python interface. 18 years ago
Shawn O. Pearce 590dd4bfd2 tar archive frontend for fast-import. 18 years ago
Simon Hausmann c9c527d7b6 Made the name of the git branch used for the perforce import configurable through a new --branch=<name> commandline option. 18 years ago
Simon Hausmann 7315866824 Catch io exceptions from git fast-import again and print the error message. 18 years ago
Simon Hausmann 1e30c07dfc Fix calculation of the newest imported revision for #head imports. 18 years ago
Simon Hausmann 23efd2545b Make specifying the revision ranges more convenient. 18 years ago
Simon Hausmann 1cd573866a Make incremental imports easier to use by storing the p4 depot path after an import in .git/config and re-using it when we're invoked again later. 18 years ago
Simon Hausmann e3d37cf098 Fixed incremental imports by using the correct "from" command instead of "merge" with git fast-import. 18 years ago
Simon Hausmann c4cf2d4f87 Minor cleanups and print an error message of git fast-import if it fails. 18 years ago
Junio C Hamano a7fd83b0b0 Remove contrib/colordiff 18 years ago
Shawn O. Pearce 88293c675c bash: Complete git-remote subcommands. 18 years ago
Shawn O. Pearce c5650b0840 bash: Support git-rebase -m continuation completion. 18 years ago
David Kågedal 28389d45fb git-blame: an Emacs minor mode to view file with git-blame output. 18 years ago
Stelian Pop 98d47d4ccf Add hg-to-git conversion utility. 18 years ago
Aneesh Kumar K.V 3fb624521e blameview: Support browsable functionality to blameview. 18 years ago
Shawn O. Pearce b2e69f6299 bash: Support git-bisect and its subcommands. 18 years ago
Shawn O. Pearce 1b71eb35dd bash: Support --add completion to git-config. 18 years ago
Shawn O. Pearce e459415c9c bash: Hide git-resolve, its deprecated. 18 years ago
Shawn O. Pearce b26c87488f bash: Offer --prune completion for git-gc. 18 years ago
Shawn O. Pearce 983591c31e bash: Hide diff-stages from completion. 18 years ago
Shawn O. Pearce d8a9fea5ea bash: Support completion on git-cherry. 18 years ago
Shawn O. Pearce ec80489132 bash: Support internal revlist options better. 18 years ago
Shawn O. Pearce b3391775e8 bash: Support unique completion when possible. 18 years ago