git.uis.cam.ac.uk - uis - git/git.git/search

/ uis / git / x / uis / git / git.git / search

2018-11-08	Derrick Stolee	merge-recursive: combine error handling Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2018-11-08	Elijah Newren	t6036, t6043: increase code coverage for file collision... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2018-11-08	Elijah Newren	merge-recursive: improve rename/rename(1to2)/add[/add... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2018-11-08	Elijah Newren	merge-recursive: use handle_file_collision for add... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2018-11-08	Elijah Newren	merge-recursive: improve handling for rename/rename... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2018-11-08	Elijah Newren	merge-recursive: fix rename/add conflict handling Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2018-11-08	Elijah Newren	merge-recursive: new function for better colliding... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2018-11-08	Elijah Newren	merge-recursive: increase marker length with depth... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2018-11-08	Elijah Newren	t6036, t6042: testcases for rename collision of already... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2018-11-08	Elijah Newren	t6042: add tests for consistency in file collision... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2018-10-18	Elijah Newren	merge-recursive: avoid showing conflicts with merge... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2018-10-18	Elijah Newren	merge-recursive: improve auto-merging messages with... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2018-09-20	Elijah Newren	merge-recursive: rename merge_file_1() and merge_content() Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2018-09-20	Elijah Newren	merge-recursive: remove final remaining caller of merge_file... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2018-09-20	Elijah Newren	merge-recursive: avoid wrapper function when unnecessary... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2018-09-20	Elijah Newren	merge-recursive: set paths correctly when three-way... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2018-09-17	Junio C Hamano	Initial batch post 2.19	commit \| commitdiff \| tree
2018-09-17	Junio C Hamano	Merge branch 'nd/bisect-show-list-fix'	commit \| commitdiff \| tree
2018-09-17	Junio C Hamano	Merge branch 'ab/fetch-tags-noclobber'	commit \| commitdiff \| tree
2018-09-17	Junio C Hamano	Merge branch 'es/worktree-forced-ops-fix'	commit \| commitdiff \| tree
2018-09-17	Junio C Hamano	Merge branch 'sg/doc-trace-appends'	commit \| commitdiff \| tree
2018-09-17	Junio C Hamano	Merge branch 'jk/diff-rendered-docs'	commit \| commitdiff \| tree
2018-09-17	Junio C Hamano	Merge branch 'jk/patch-corrupted-delta-fix'	commit \| commitdiff \| tree
2018-09-17	Junio C Hamano	Merge branch 'ds/commit-graph-tests'	commit \| commitdiff \| tree
2018-09-17	Junio C Hamano	Merge branch 'jk/pack-objects-with-bitmap-fix'	commit \| commitdiff \| tree
2018-09-17	Junio C Hamano	Merge branch 'rs/mailinfo-format-flowed'	commit \| commitdiff \| tree
2018-09-17	Junio C Hamano	Merge branch 'jk/cocci'	commit \| commitdiff \| tree
2018-09-17	Junio C Hamano	Merge branch 'tg/rerere-doc-updates'	commit \| commitdiff \| tree
2018-09-17	Junio C Hamano	Merge branch 'es/format-patch-rangediff'	commit \| commitdiff \| tree
2018-09-17	Junio C Hamano	Merge branch 'es/format-patch-interdiff'	commit \| commitdiff \| tree
2018-09-17	Junio C Hamano	Merge branch 'cc/delta-islands'	commit \| commitdiff \| tree
2018-09-17	Junio C Hamano	Merge branch 'jk/trailer-fixes'	commit \| commitdiff \| tree
2018-09-17	Junio C Hamano	Merge branch 'sb/range-diff-colors'	commit \| commitdiff \| tree
2018-09-17	Junio C Hamano	Merge branch 'jk/pack-delta-reuse-with-bitmap'	commit \| commitdiff \| tree
2018-09-17	Junio C Hamano	Merge branch 'nd/unpack-trees-with-cache-tree'	commit \| commitdiff \| tree
2018-09-17	Junio C Hamano	Merge branch 'ds/reachable'	commit \| commitdiff \| tree
2018-09-17	Junio C Hamano	Merge branch 'sb/submodule-update-in-c'	commit \| commitdiff \| tree
2018-09-17	Junio C Hamano	Merge branch 'tg/rerere'	commit \| commitdiff \| tree
2018-09-17	Junio C Hamano	Merge branch 'ds/multi-pack-index'	commit \| commitdiff \| tree
2018-09-17	Junio C Hamano	Merge branch 'jk/branch-l-1-repurpose'	commit \| commitdiff \| tree
2018-09-17	Junio C Hamano	Merge branch 'tg/conflict-marker-size'	commit \| commitdiff \| tree
2018-09-17	Junio C Hamano	Merge branch 'ts/doc-build-manpage-xsl-quietly'	commit \| commitdiff \| tree
2018-09-17	Junio C Hamano	Merge branch 'jk/rev-list-stdin-noop-is-ok'	commit \| commitdiff \| tree
2018-09-17	Junio C Hamano	Merge branch 'bp/checkout-new-branch-optim'	commit \| commitdiff \| tree
2018-09-17	Junio C Hamano	Merge branch 'sg/t1404-update-ref-test-timeout'	commit \| commitdiff \| tree
2018-09-17	Junio C Hamano	Merge branch 'nd/clone-case-smashing-warning'	commit \| commitdiff \| tree
2018-09-17	Junio C Hamano	Merge branch 'mk/http-backend-content-length'	commit \| commitdiff \| tree
2018-09-17	Junio C Hamano	Revert "doc/Makefile: drop doc-diff worktree and temporary...	commit \| commitdiff \| tree
2018-09-11	Max Kirillov	http-backend test: make empty CONTENT_LENGTH test more... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2018-09-10	Junio C Hamano	Git 2.19 Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2018-09-10	Junio C Hamano	Merge tag 'l10n-2.19.0-rnd2' of git://github.com/git...	commit \| commitdiff \| tree
2018-09-10	Junio C Hamano	Merge branch 'jn/submodule-core-worktree-revert'	commit \| commitdiff \| tree
2018-09-10	Junio C Hamano	Merge branch 'mk/http-backend-content-length'	commit \| commitdiff \| tree
2018-09-08	Jonathan Nieder	Revert "Merge branch 'sb/submodule-core-worktree'" Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2018-09-07	Max Kirillov	http-backend: allow empty CONTENT_LENGTH Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2018-09-05	Jeff King	doc-diff: force worktree add Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2018-09-04	Junio C Hamano	Git 2.19-rc2 Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2018-09-04	Junio C Hamano	Merge branch 'es/chain-lint-more'	commit \| commitdiff \| tree
2018-09-04	Junio C Hamano	Merge branch 'ab/portable-more'	commit \| commitdiff \| tree
2018-09-04	Junio C Hamano	Merge branch 'es/freebsd-iconv-portability'	commit \| commitdiff \| tree
2018-09-04	Junio C Hamano	Merge branch 'ds/commit-graph-lockfile-fix'	commit \| commitdiff \| tree
2018-09-04	Junio C Hamano	Merge branch 'en/directory-renames-nothanks'	commit \| commitdiff \| tree
2018-09-04	Junio C Hamano	Merge branch 'pw/rebase-i-author-script-fix'	commit \| commitdiff \| tree
2018-09-04	SZEDER Gábor	Documentation/git.txt: clarify that GIT_TRACE=/path... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2018-09-04	Nguyễn Thái Ngọc Duy	bisect.c: make show_list() build again Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2018-09-04	Jeff King	pack-bitmap: drop "loaded" flag Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2018-09-04	Jeff King	traverse_bitmap_commit_list(): don't free result Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2018-09-04	Jeff King	t5310: test delta reuse with bitmaps Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2018-09-04	Jeff King	bitmap_has_sha1_in_uninteresting(): drop BUG check Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2018-08-31	Ævar Arnfjörð Bjarmason	fetch: stop clobbering existing tags without --force Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2018-08-31	Ævar Arnfjörð Bjarmason	fetch: document local ref updates with/without --force Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2018-08-31	Ævar Arnfjörð Bjarmason	push doc: correct lies about how push refspecs work Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2018-08-31	Ævar Arnfjörð Bjarmason	push doc: move mention of "tag <tag>" later in the... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2018-08-31	Ævar Arnfjörð Bjarmason	push doc: remove confusing mention of remote merger Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2018-08-31	Ævar Arnfjörð Bjarmason	fetch tests: add a test for clobbering tag behavior Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2018-08-31	Ævar Arnfjörð Bjarmason	push tests: use spaces in interpolated string Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2018-08-31	Ævar Arnfjörð Bjarmason	push tests: make use of unused $1 in test description Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2018-08-31	Ævar Arnfjörð Bjarmason	fetch: change "branch" to "reference" in --force -h... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2018-08-31	Eric Sunshine	config.mak.uname: resolve FreeBSD iconv-related compilation... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2018-08-31	Eric Sunshine	doc/Makefile: drop doc-diff worktree and temporary... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2018-08-31	Eric Sunshine	doc-diff: add --clean mode to remove temporary working... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2018-08-31	Eric Sunshine	doc-diff: fix non-portable 'man' invocation Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2018-08-30	Jeff King	doc/git-branch: remove obsolete "-l" references Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2018-08-30	Jeff King	t5303: use printf to generate delta bases Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2018-08-30	Derrick Stolee	commit: don't use generation numbers if not needed Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2018-08-30	Jeff King	patch-delta: handle truncated copy parameters Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2018-08-30	Jann Horn	patch-delta: consistently report corruption Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2018-08-30	Jann Horn	patch-delta: fix oob read Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2018-08-30	Jeff King	t5303: test some corrupt deltas Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2018-08-30	Jeff King	test-delta: read input into a heap buffer Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2018-08-30	Jeff King	doc-diff: always use oids inside worktree Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2018-08-30	Eric Sunshine	worktree: delete .git/worktrees if empty after 'remove' Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2018-08-30	Eric Sunshine	worktree: teach 'remove' to override lock when --force... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2018-08-30	Eric Sunshine	worktree: teach 'move' to override lock when --force... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2018-08-30	Eric Sunshine	worktree: teach 'add' to respect --force for registered... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2018-08-30	Eric Sunshine	worktree: disallow adding same path multiple times Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2018-08-30	Eric Sunshine	worktree: prepare for more checks of whether path can... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2018-08-30	Eric Sunshine	worktree: generalize delete_git_dir() to reduce code... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2018-08-30	Eric Sunshine	worktree: move delete_git_dir() earlier in file for... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2018-08-30	Eric Sunshine	worktree: don't die() in library function find_worktree() Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
next

Local mirror of git

RSS Atom