Public Git Hosting - git.git/search

2018-08-06	Thomas Gummerer	rerere: recalculate conflict ID when unresolved conflict... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2018-08-06	Thomas Gummerer	rerere: teach rerere to handle nested conflicts Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2018-08-06	Thomas Gummerer	rerere: return strbuf from handle path Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2018-08-06	Thomas Gummerer	rerere: factor out handle_conflict function Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2018-08-06	Thomas Gummerer	rerere: only return whether a path has conflicts or not Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2018-08-06	Thomas Gummerer	rerere: fix crash with files rerere can't handle Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2018-08-06	Thomas Gummerer	rerere: add documentation for conflict normalization Helped-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2018-08-06	Thomas Gummerer	rerere: mark strings for translation Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2018-07-16	Thomas Gummerer	rerere: wrap paths in output in sq Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2018-07-16	Thomas Gummerer	rerere: lowercase error messages Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2018-07-16	Thomas Gummerer	rerere: unify error messages when read_cache fails Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2018-06-28	Junio C Hamano	Second batch for 2.19 cycle Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2018-06-28	Junio C Hamano	Merge branch 'sb/fix-fetching-moved-submodules'	commit \| commitdiff \| tree
2018-06-28	Junio C Hamano	Merge branch 'tz/cred-netrc-cleanup'	commit \| commitdiff \| tree
2018-06-28	Junio C Hamano	Merge branch 'jc/clean-after-sanity-tests'	commit \| commitdiff \| tree
2018-06-28	Junio C Hamano	Merge branch 'nd/completion-negation'	commit \| commitdiff \| tree
2018-06-28	Junio C Hamano	Merge branch 'pw/add-p-recount'	commit \| commitdiff \| tree
2018-06-28	Junio C Hamano	Merge branch 'jk/fetch-all-peeled-fix'	commit \| commitdiff \| tree
2018-06-28	Junio C Hamano	Merge branch 'ms/send-pack-honor-config'	commit \| commitdiff \| tree
2018-06-28	Junio C Hamano	Merge branch 'jh/partial-clone'	commit \| commitdiff \| tree
2018-06-28	Junio C Hamano	Merge branch 'sg/gpg-tests-fix'	commit \| commitdiff \| tree
2018-06-28	Junio C Hamano	Merge branch 'as/safecrlf-quiet-fix'	commit \| commitdiff \| tree
2018-06-28	Junio C Hamano	Merge branch 'ab/refspec-init-fix'	commit \| commitdiff \| tree
2018-06-25	Junio C Hamano	First batch for 2.19 cycle Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2018-06-25	Junio C Hamano	Merge branch 'sb/plug-misc-leaks'	commit \| commitdiff \| tree
2018-06-25	Junio C Hamano	Merge branch 'cc/tests-without-assuming-ref-files-backend'	commit \| commitdiff \| tree
2018-06-25	Junio C Hamano	Merge branch 'sg/update-ref-stdin-cleanup'	commit \| commitdiff \| tree
2018-06-25	Junio C Hamano	Merge branch 'nd/reject-empty-shallow-request'	commit \| commitdiff \| tree
2018-06-25	Junio C Hamano	Merge branch 'ls/complete-remote-update-names'	commit \| commitdiff \| tree
2018-06-25	Junio C Hamano	Merge branch 'ag/rebase-p'	commit \| commitdiff \| tree
2018-06-25	Junio C Hamano	Merge branch 'nd/complete-config-vars'	commit \| commitdiff \| tree
2018-06-25	Junio C Hamano	Merge branch 'sb/object-store-alloc'	commit \| commitdiff \| tree
2018-06-25	Junio C Hamano	Merge branch 'jk/show-index'	commit \| commitdiff \| tree
2018-06-25	Junio C Hamano	Merge branch 'en/merge-recursive-tests'	commit \| commitdiff \| tree
2018-06-25	Junio C Hamano	Merge branch 'nd/diff-apply-ita'	commit \| commitdiff \| tree
2018-06-25	Junio C Hamano	Merge branch 'ds/commit-graph-lockfile-fix'	commit \| commitdiff \| tree
2018-06-25	Junio C Hamano	Merge branch 'nd/commit-util-to-slab'	commit \| commitdiff \| tree
2018-06-25	Junio C Hamano	Merge branch 'pc/submodule-helper-foreach'	commit \| commitdiff \| tree
2018-06-25	Junio C Hamano	Prepare to start 2.19 cycle Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2018-06-25	Stefan Beller	sequencer.c: plug mem leak in git_sequencer_config Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2018-06-21	Junio C Hamano	Git 2.18 Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2018-06-19	Junio C Hamano	Merge branch 'en/rename-directory-detection-reboot'	commit \| commitdiff \| tree
2018-06-19	Junio C Hamano	Merge tag 'l10n-2.18.0-rnd3.1' of git://github.com...	commit \| commitdiff \| tree
2018-06-19	Junio C Hamano	Merge branch 'cf/submodule-progress-dissociate'	commit \| commitdiff \| tree
2018-06-19	Junio C Hamano	Merge branch 'js/rebase-i-root-fix'	commit \| commitdiff \| tree
2018-06-19	Stefan Beller	t7400: encapsulate setup code in test_expect_success Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2018-06-19	Todd Zullinger	t3404: check root commit in 'rebase -i --root reword... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2018-06-19	Karthikeyan Singaravelan	doc: fix typos in documentation and release notes Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2018-06-18	Todd Zullinger	git-credential-netrc: make "all" default target of... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2018-06-18	Junio C Hamano	Almost 2.18 final Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2018-06-18	Junio C Hamano	Merge branch 'es/make-no-iconv'	commit \| commitdiff \| tree
2018-06-18	Junio C Hamano	Merge branch 'sg/t7406-chain-fix'	commit \| commitdiff \| tree
2018-06-18	Junio C Hamano	Merge branch 'ks/branch-set-upstream'	commit \| commitdiff \| tree
2018-06-18	Junio C Hamano	Merge branch 'js/rebase-i-root-fix'	commit \| commitdiff \| tree
2018-06-18	Junio C Hamano	Merge branch 'jk/ewah-bounds-check'	commit \| commitdiff \| tree
2018-06-18	Junio C Hamano	Merge tag 'l10n-2.18.0-rnd3' of git://github.com/git...	commit \| commitdiff \| tree
2018-06-18	Junio C Hamano	A bunch of micro-fixes before going 2.18 final Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2018-06-18	Junio C Hamano	Merge branch 'sb/blame-color'	commit \| commitdiff \| tree
2018-06-18	Junio C Hamano	Merge branch 'mw/doc-merge-enumfix'	commit \| commitdiff \| tree
2018-06-18	Junio C Hamano	Merge branch 'en/rename-directory-detection'	commit \| commitdiff \| tree
2018-06-18	Junio C Hamano	Merge branch 'rd/doc-remote-tracking-with-hyphen'	commit \| commitdiff \| tree
2018-06-18	Junio C Hamano	Merge branch 'jl/zlib-restore-nul-termination'	commit \| commitdiff \| tree
2018-06-18	Junio C Hamano	Merge branch 'ab/cred-netrc-no-autodie'	commit \| commitdiff \| tree
2018-06-18	Junio C Hamano	Merge branch 'km/doc-workflows-typofix'	commit \| commitdiff \| tree
2018-06-18	Junio C Hamano	Merge branch 'ld/git-p4-updates'	commit \| commitdiff \| tree
2018-06-18	Junio C Hamano	Merge branch 'rd/diff-options-typofix'	commit \| commitdiff \| tree
2018-06-18	Junio C Hamano	Merge branch 'rd/comment-typofix-in-sha1-file'	commit \| commitdiff \| tree
2018-06-18	René Scharfe	merge-recursive: use xstrdup() instead of fixed buffer Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2018-06-18	SZEDER Gábor	RelNotes 2.18: minor fix to entry about dynamically... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2018-06-18	SZEDER Gábor	t7406-submodule-update: fix broken &&-chains Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2018-06-18	Johannes Schindelin	rebase --root: fix amending root commit messages Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2018-06-18	Todd Zullinger	rebase --root: demonstrate a bug while amending root... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2018-06-18	Jeff King	ewah: adjust callers of ewah_read_mmap() Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2018-06-18	Jeff King	ewah_read_mmap: bounds-check mmap reads Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2018-06-18	Kaartic Sivaraam	t3200: clarify description of --set-upstream test Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2018-06-18	Luis Marsano	git-credential-netrc: fix exit status when tests fail Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2018-06-18	Luis Marsano	git-credential-netrc: use in-tree Git.pm for tests Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2018-06-18	Todd Zullinger	git-credential-netrc: minor whitespace cleanup in test... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2018-06-15	Eric Sunshine	Makefile: make NO_ICONV really mean "no iconv" Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2018-06-15	Junio C Hamano	tests: clean after SANITY tests Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2018-06-14	Stefan Beller	t5526: test recursive submodules when fetching moved... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2018-06-14	Stefan Beller	submodule: fix NULL correctness in renamed broken submodules Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2018-06-14	Meng-Sung Wu	doc: update the order of the syntax `git merge --continue` Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2018-06-14	René Scharfe	blame: release string_list after use in parse_color_fields() Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2018-06-14	René Scharfe	merge-recursive: use xstrdup() instead of fixed buffer Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2018-06-13	Junio C Hamano	Git 2.18-rc2 Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2018-06-13	Junio C Hamano	Merge branch 'jk/index-pack-maint'	commit \| commitdiff \| tree
2018-06-13	Junio C Hamano	Merge branch 'sg/completion-zsh-workaround'	commit \| commitdiff \| tree
2018-06-13	Junio C Hamano	Merge branch 'sb/submodule-merge-in-merge-recursive'	commit \| commitdiff \| tree
2018-06-13	Junio C Hamano	Merge branch 'jk/submodule-fsck-loose-fixup'	commit \| commitdiff \| tree
2018-06-13	Kirill Smelkov	fetch-pack: test explicitly that --all can fetch tag... Helped-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2018-06-13	Jeremy Linton	packfile: correct zlib buffer handling Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2018-06-13	Elijah Newren	RelNotes 2.18: clarify where directory rename detection... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2018-06-13	Robert P. J. Day	Use hyphenated "remote-tracking branch" (docs and comments) Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2018-06-13	Ævar Arnfjörð Bjarmason	git-credential-netrc: remove use of "autodie" Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2018-06-12	Luke Diamand	git-p4: auto-size the block Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2018-06-12	Luke Diamand	git-p4: narrow the scope of exceptions caught when... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2018-06-12	Luke Diamand	git-p4: raise exceptions from p4CmdList based on error... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2018-06-12	Luke Diamand	git-p4: better error reporting when p4 fails Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2018-06-12	Luke Diamand	git-p4: add option to disable syncing of p4/master... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
next

The Best VCS Around

RSS Atom