mirrors/jgit - jgit - source @ dussan.org

트리: c310fa0c80

작성자	SHA1	메시지	날짜
Robin Rosenberg	c310fa0c80	Mark non-externalizable strings as such A few classes such as Constanrs are marked with @SuppressWarnings, as are toString() methods with many liternal, but otherwise $NLS-n$ is used for string containing text that should not be translated. A few literals may fall into the gray zone, but mostly I've tried to only tag the obvious ones. Change-Id: I22e50a77e2bf9e0b842a66bdf674e8fa1692f590	11 년 전
Robin Rosenberg	8b06c46e30	Add a case statement for fast-forward merge This case was ommitted. Treat the same as a non-fastworwad merge. Change-Id: Ia81e2430dfe04c3ce9b6e2f8fb4b6c646293a174	11 년 전
Tomasz Zarna	318f3d4643	Add support for --no-ff while merging Bug: 394432 Change-Id: I373128c0ba949f9b24248874f77f3d68b50ccfd1 Signed-off-by: Chris Aniszczyk <zx@twitter.com>	11 년 전
Tomasz Zarna	e8c25a1738	Add --squash option to org.eclipse.jgit.pgm.Merge Change-Id: Ifd20b6f4731cfa71319145cac7b464aa53db18b8	11 년 전
Robin Rosenberg	7de1154d21	Remove uses of TextBuiltin.out in favor of outw These came from patches in review in parallel with the introduction of the exception throwing print writer. Change-Id: I1c27fa276eb1fcf12ad19792049c35cb52518c16	11 년 전
Tomasz Zarna	f7b644df66	Add tests for output result of merging -- org.eclipse.jgit.pgm.Merge Change-Id: I888c7e80503b869d65a9617e6a07e01d1ff5f197	11 년 전
Robin Rosenberg	caa362f20d	Check for write errors in standard out and exit with error The underlying problem is that System.out is a PrintWriter and as such it does not throw exceptions on error, but rather just sets a flag and continues. This changes replaces the use of System.out with a PrintWriter-like writer that does not catch error, but instead throw them to the caller. Bug: 366243 Change-Id: I44405edc4416e943b87f09a0f6ed041c6c51b046	11 년 전
Tomasz Zarna	75b60afe41	Typo in CLIText#unknownMergeStratey, should be #unknownMergeStrategy Change-Id: I4d4aa59723d6422ff755165e45f368da76d309ab Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>	12 년 전
Tomasz Zarna	1efecaa9f9	Merge in JGit CLI is missing break statement Change-Id: I2095601b848e66e54d5dac828ef6ed1a4c5ae66c Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>	13 년 전
Christian Halstrick	153283f05a	Added Merge command to the CLI This merge command accepts the merge strategy as option and uses the resolve strategy as default. It expects exactly one other revision which is merged with current head. Change-Id: Ia8c188b93ade4afabe6a9ccf267faf045f359a3a Signed-off-by: Christian Halstrick <christian.halstrick@sap.com> Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>	14 년 전

10 커밋 (c310fa0c802f40a774edb58641de3ac5bfad0e2c)