jgit.git - JGit, the Java implementation of git: https://github.com/eclipse-jgit/jgit

	Commit message (Collapse)	Author	Age	Files	Lines
*	[errorprone] Add missing javadoc summary	Matthias Sohn	2023-09-25	1	-0/+8
\| \| \| \| \| \|	see https://google.github.io/styleguide/javaguide.html#s7.2-summary-fragment Change-Id: Iaf4a6b55d4e4c59b7a2da3451164abb1bb47d4a1
*	[errorprone] CommandLineMergeTool: Remove unused constuctor	Matthias Sohn	2023-09-25	1	-5/+0
\| \| \| \| \| \|	See https://errorprone.info/bugpattern/UnusedMethod Change-Id: I711279d7b81c61111c7c129b3d119affc515fe70
*	Add command line support for "git mergetool"	Andre Bossert	2022-05-25	1	-0/+327
	see: https://git-scm.com/docs/git-mergetool see: https://git-scm.com/docs/git-config * add command line support for "git mergetool" * add option handling for "--tool-help", "--tool=<mytool>", "--[no-]prompt", "--[no-]gui" * handle prompt * add MergeTools * add pre-defined mergetools * print merge actions --> no execute, will be done later Bug: 356832 Change-Id: I6e505ffc3d03f75ecf4bba452a25d25dfcf5793f Signed-off-by: Andre Bossert <andre.bossert@siemens.com>