org/kernel/git.git - forked from git/git

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