delta/git.git - github.com: git/git.git

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge branch 'ls/p4-path-encoding'	Junio C Hamano	2017-02-16	1	-10/+14
\|\
\| *	git-p4: fix git-p4.pathEncoding for removed filesls/p4-path-encoding	Lars Schneider	2017-02-10	1	-10/+14
* \|	Merge branch 'gv/mingw-p4-mapuser'	Junio C Hamano	2017-02-02	1	-1/+1
\|\ \
\| * \|	git-p4: fix git-p4.mapUser on Windowsgv/mingw-p4-mapuser	George Vanburgh	2017-01-30	1	-1/+1
\| * \|	Merge branch 'gv/p4-multi-path-commit-fix' into maint	Junio C Hamano	2017-01-17	1	-2/+2
\| \|\ \
\| * \ \	Merge branch 'ld/p4-compare-dir-vs-symlink' into maint	Junio C Hamano	2017-01-17	1	-6/+20
\| \|\ \ \
* \| \ \ \	Merge branch 'ls/p4-retry-thrice'	Junio C Hamano	2017-01-18	1	-1/+3
\|\ \ \ \ \
\| * \| \| \| \|	git-p4: do not pass '-r 0' to p4 commandsls/p4-retry-thrice	Igor Kushnir	2016-12-29	1	-1/+3
* \| \| \| \| \|	Merge branch 'ls/p4-lfs'	Junio C Hamano	2016-12-27	1	-2/+2
\|\ \ \ \ \ \
\| * \| \| \| \| \|	git-p4: add diff/merge properties to .gitattributes for GitLFS filesls/p4-lfs	Lars Schneider	2016-12-20	1	-2/+2
* \| \| \| \| \| \|	Merge branch 'gv/p4-multi-path-commit-fix'	Junio C Hamano	2016-12-27	1	-2/+2
\|\ \ \ \ \ \ \ \| \| \|_\|_\|_\|/ / \| \|/\| \| \| \| \|
\| * \| \| \| \| \|	git-p4: fix multi-path changelist empty commitsgv/p4-multi-path-commit-fix	George Vanburgh	2016-12-19	1	-2/+2
\| * \| \| \| \| \|	Merge branch 'ao/p4-has-branch-prefix-fix' into maint	Junio C Hamano	2016-07-11	1	-1/+1
\| \|\ \ \ \ \ \
* \| \ \ \ \ \ \	Merge branch 'ld/p4-compare-dir-vs-symlink'	Junio C Hamano	2016-12-27	1	-6/+20
\|\ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \|
\| * \| \| \| \| \| \|	git-p4: avoid crash adding symlinked directoryld/p4-compare-dir-vs-symlink	Luke Diamand	2016-12-18	1	-6/+20
* \| \| \| \| \| \| \|	Merge branch 'ld/p4-worktree'	Junio C Hamano	2016-12-19	1	-4/+13
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	git-p4: support git worktreesld/p4-worktree	Luke Diamand	2016-12-13	1	-4/+13
\| \|/ / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'ls/p4-retry-thrice'	Junio C Hamano	2016-12-16	1	-0/+5
\|\ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \|
\| * \| \| \| \| \| \|	git-p4: add config to retry p4 commands; retry 3 times by default	Lars Schneider	2016-12-05	1	-0/+5
\| \|/ / / / / /
* \| \| \| \| \| \|	Merge branch 'ls/p4-empty-file-on-lfs'	Junio C Hamano	2016-12-16	1	-12/+17
\|\ \ \ \ \ \ \ \| \| \|_\|_\|_\|/ / \| \|/\| \| \| \| \|
\| * \| \| \| \| \|	git-p4: fix empty file processing for large file system backend GitLFSls/p4-empty-file-on-lfs	Lars Schneider	2016-12-05	1	-12/+17
\| \|/ / / / /
* \| \| \| \| \|	git-p4: support updating an existing shelved changelistld/p4-update-shelve	Luke Diamand	2016-12-05	1	-4/+29
* \| \| \| \| \|	git-p4: allow submit to create shelved changelists.vk/p4-submit-shelve	Vinicius Kursancew	2016-11-29	1	-14/+22
\|/ / / / /
* \| \| \| \|	Spelling fixesvs/typofix	Ville Skyttä	2016-08-11	1	-1/+1
* \| \| \| \|	Merge branch 'ls/p4-tmp-refs'	Junio C Hamano	2016-07-19	1	-1/+1
\|\ \ \ \ \
\| * \| \| \| \|	git-p4: place temporary refs used for branch import under refs/git-p4-tmpls/p4-tmp-refs	Lars Schneider	2016-07-08	1	-1/+1
\| \|/ / / /
* \| \| \| \|	Merge branch 'ao/p4-has-branch-prefix-fix'	Junio C Hamano	2016-07-06	1	-1/+1
\|\ \ \ \ \ \| \|/ / / / \|/\| / / / \| \|/ / /
\| * \| \|	git-p4: correct hasBranchPrefix verbose outputao/p4-has-branch-prefix-fix	Andrew Oakley	2016-06-22	1	-1/+1
* \| \| \|	Merge branch 'ls/p4-lfs'	Junio C Hamano	2016-05-10	1	-3/+10
\|\ \ \ \ \| \| \|/ / \| \|/\| \|
\| * \| \|	git-p4: fix Git LFS pointer parsing	Lars Schneider	2016-04-28	1	-3/+10
* \| \| \|	git-p4: add P4 jobs to git commit messagejd/p4-jobs-in-commit	Jan Durovec	2016-04-19	1	-0/+12
* \| \| \|	Merge branch 'ls/p4-map-user'	Junio C Hamano	2016-04-06	1	-0/+9
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	git-p4: map a P4 user to Git author name and email addressls/p4-map-user	Lars Schneider	2016-03-15	1	-0/+9
\| \| \|/ \| \|/\|
* \| \|	git-p4.py: add support for filetype changerp/p4-filetype-change	Romain Picard	2016-01-13	1	-2/+7
\|/ /
* \|	Merge branch 'sh/p4-multi-depot'	Junio C Hamano	2015-12-28	1	-25/+30
\|\ \
\| * \|	git-p4: reduce number of server queries for fetchessh/p4-multi-depot	Sam Hocevar	2015-12-21	1	-23/+21
\| * \|	git-p4: support multiple depot paths in p4 submit	Sam Hocevar	2015-12-21	1	-2/+9
* \| \|	Merge branch 'ls/p4-keep-empty-commits'	Junio C Hamano	2015-12-15	1	-17/+27
\|\ \ \ \| \|/ / \|/\| / \| \|/
\| *	git-p4: add option to keep empty commitsls/p4-keep-empty-commits	Lars Schneider	2015-12-10	1	-17/+27
* \|	Merge branch 'maint'	Jeff King	2015-12-01	1	-43/+57
\|\ \
\| * \	Merge branch 'eg/p4-submit-catch-failure' into maint	Jeff King	2015-12-01	1	-34/+37
\| \|\ \
\| \| * \|	git-p4: clean up after p4 submit failureeg/p4-submit-catch-failure	GIRARD Etienne	2015-11-24	1	-34/+37
\| * \| \|	Merge branch 'ld/p4-detached-head' into maint	Jeff King	2015-12-01	1	-9/+20
\| \|\ \ \
\| \| * \| \|	git-p4: work with a detached headld/p4-detached-head	Luke Diamand	2015-11-24	1	-7/+16
\| \| * \| \|	git-p4: add option to system() to return subshell status	Luke Diamand	2015-11-24	1	-2/+4
\| \| \|/ /
\| * \| \|	Merge branch 'ls/p4-translation-failure' into maint	Junio C Hamano	2015-11-03	1	-11/+16
\| \|\ \ \
\| * \ \ \	Merge branch 'ld/p4-import-labels' into maint	Junio C Hamano	2015-11-03	1	-8/+17
\| \|\ \ \ \ \| \| \|_\|/ / \| \|/\| \| \|
* \| \| \| \|	Merge branch 'dk/p4-import-ctypes'	Junio C Hamano	2015-10-26	1	-0/+1
\|\ \ \ \ \
\| * \| \| \| \|	git-p4: import the ctypes moduledk/p4-import-ctypes	Dennis Kaarsemaker	2015-10-20	1	-0/+1
* \| \| \| \| \|	Merge branch 'ls/p4-lfs'	Junio C Hamano	2015-10-15	1	-16/+254
\|\ \ \ \ \ \