Public Git Hosting - git/jnareb-git.git/search

2010-08-26	Jonathan Nieder	merge-recursive: expose merge options for builtin merge Helped-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2010-08-06	Jonathan Nieder	merge-recursive --renormalize Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2010-08-06	Jonathan Nieder	rerere: never renormalize Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2010-08-06	Jonathan Nieder	rerere: migrate to parse-options API Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2010-08-06	Jonathan Nieder	t4200 (rerere): modernize style Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2010-08-06	Jonathan Nieder	ll-merge: let caller decide whether to renormalize Improved-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2010-08-06	Jonathan Nieder	ll-merge: make flag easier to populate Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2010-08-06	Jonathan Nieder	Documentation/technical: document ll_merge Cc: Junio C Hamano <gitster@pobox.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2010-08-06	Jonathan Nieder	merge-trees: let caller decide whether to renormalize Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2010-08-06	Jonathan Nieder	merge-trees: push choice to renormalize away from low... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2010-08-06	Jonathan Nieder	t6038 (merge.renormalize): check that it can be turned off Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2010-08-06	Jonathan Nieder	t6038 (merge.renormalize): try checkout -m and cherry... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2010-08-06	Jonathan Nieder	t6038 (merge.renormalize): style nitpicks Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2010-07-02	Eyvind Bernhardsen	Don't expand CRLFs when normalizing text during merge Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2010-07-02	Eyvind Bernhardsen	Try normalizing files to avoid delete/modify conflicts... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2010-07-02	Eyvind Bernhardsen	Avoid conflicts when merging branches with mixed normalization Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2010-06-27	Junio C Hamano	Git 1.7.2-rc0 Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2010-06-27	Junio C Hamano	Merge branch 'cp/textconv-cat-file'	commit \| commitdiff \| tree
2010-06-27	Junio C Hamano	Merge branch 'pb/maint-perl-errmsg-no-dir'	commit \| commitdiff \| tree
2010-06-27	Junio C Hamano	Merge branch 'tr/send-email-8bit'	commit \| commitdiff \| tree
2010-06-27	Junio C Hamano	Merge branch 'js/maint-am-rebase-invalid-author'	commit \| commitdiff \| tree
2010-06-27	Junio C Hamano	Merge branch 'ab/blame-textconv'	commit \| commitdiff \| tree
2010-06-27	Junio C Hamano	Merge branch 'jn/show-num-walks'	commit \| commitdiff \| tree
2010-06-25	Junio C Hamano	Merge branch 'maint'	commit \| commitdiff \| tree
2010-06-25	Ramsay Jones	msvc: Fix some compiler warnings Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2010-06-25	Christian Couder	Documentation: grep: fix asciidoc problem with -- Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2010-06-24	Michael J Gruber	git-cat-file.txt: Document --textconv Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2010-06-24	Ramsay Jones	msvc: Fix some "expr evaluates to function" compiler... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2010-06-23	Junio C Hamano	Merge branch 'jk/url-decode'	commit \| commitdiff \| tree
2010-06-23	Junio C Hamano	url.c: "<scheme>://" part at the beginning should not... Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2010-06-22	Junio C Hamano	Update draft release notes to 1.7.2 Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2010-06-22	Junio C Hamano	Merge branch 'jc/maint-simpler-common-prefix'	commit \| commitdiff \| tree
2010-06-22	Junio C Hamano	Merge branch 'sb/format-patch-signature'	commit \| commitdiff \| tree
2010-06-22	Junio C Hamano	Merge branch 'mg/pretty-magic-space'	commit \| commitdiff \| tree
2010-06-22	Junio C Hamano	Merge branch 'jn/gitweb-return-or-exit-cleanup'	commit \| commitdiff \| tree
2010-06-22	Junio C Hamano	Merge branch 'bd/maint-unpack-trees-parawalk-fix'	commit \| commitdiff \| tree
2010-06-22	Junio C Hamano	Merge branch 'cc/cherry-pick-series'	commit \| commitdiff \| tree
2010-06-22	Junio C Hamano	Merge branch 'jc/rev-list-ancestry-path'	commit \| commitdiff \| tree
2010-06-22	Junio C Hamano	Merge branch 'lt/extended-sha1-match-commit-with-regexp'	commit \| commitdiff \| tree
2010-06-22	Junio C Hamano	Merge branch 'maint'	commit \| commitdiff \| tree
2010-06-22	Junio C Hamano	Update draft release notes to 1.7.1.1 Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2010-06-22	Junio C Hamano	Merge branch 'ic/maint-rebase-i-abort' into maint	commit \| commitdiff \| tree
2010-06-22	Junio C Hamano	Merge branch 'cc/maint-commit-reflog-msg' into maint	commit \| commitdiff \| tree
2010-06-22	Junio C Hamano	Merge branch 'jk/maint-advice-empty-amend' into maint	commit \| commitdiff \| tree
2010-06-22	Junio C Hamano	Merge branch 'tc/commit-abbrev-fix' into maint	commit \| commitdiff \| tree
2010-06-22	Junio C Hamano	Merge branch 'jn/document-rebase-i-p-limitation' into...	commit \| commitdiff \| tree
2010-06-22	Junio C Hamano	Merge branch 'jn/checkout-doc' into maint	commit \| commitdiff \| tree
2010-06-22	Junio C Hamano	Merge branch 'cc/maint-diff-CC-binary' into maint	commit \| commitdiff \| tree
2010-06-22	Junio C Hamano	Merge branch 'jc/t9129-any-utf8' into maint	commit \| commitdiff \| tree
2010-06-22	Junio C Hamano	Merge branch 'cb/ls-files-cdup' into maint	commit \| commitdiff \| tree
2010-06-22	Junio C Hamano	Merge branch 'tc/merge-m-log' into maint	commit \| commitdiff \| tree
2010-06-22	Junio C Hamano	Merge branch 'ph/clone-message-reword' into maint	commit \| commitdiff \| tree
2010-06-22	Junio C Hamano	Merge branch 'jn/maint-amend-missing-name' into maint	commit \| commitdiff \| tree
2010-06-22	Junio C Hamano	Merge branch 'pc/remove-warn' into maint	commit \| commitdiff \| tree
2010-06-21	Junio C Hamano	tests: remove unnecessary '^' from 'expr' regular expression Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2010-06-21	Junio C Hamano	Merge branch 'js/maint-receive-pack-symref-alias'	commit \| commitdiff \| tree
2010-06-21	Junio C Hamano	Merge branch 'cc/maint-commit-reflog-msg'	commit \| commitdiff \| tree
2010-06-21	Junio C Hamano	Merge branch 'ic/maint-rebase-i-abort'	commit \| commitdiff \| tree
2010-06-21	Junio C Hamano	Merge branch 'jk/maint-advice-empty-amend'	commit \| commitdiff \| tree
2010-06-21	Junio C Hamano	Merge branch 'eb/core-eol'	commit \| commitdiff \| tree
2010-06-21	Junio C Hamano	Merge branch 'fg/autocrlf'	commit \| commitdiff \| tree
2010-06-21	Junio C Hamano	Merge branch 'sm/branch-broken-ref'	commit \| commitdiff \| tree
2010-06-21	Junio C Hamano	Merge branch 'rr/parse-date-refactor'	commit \| commitdiff \| tree
2010-06-21	Junio C Hamano	Merge branch 'jn/document-rebase-i-p-limitation'	commit \| commitdiff \| tree
2010-06-21	Junio C Hamano	Merge branch 'tc/commit-abbrev-fix'	commit \| commitdiff \| tree
2010-06-21	Junio C Hamano	Merge branch 'tr/receive-pack-aliased-update-fix'	commit \| commitdiff \| tree
2010-06-21	Junio C Hamano	Merge branch 'gs/usage-to-stdout'	commit \| commitdiff \| tree
2010-06-21	Junio C Hamano	Merge branch 'js/async-thread'	commit \| commitdiff \| tree
2010-06-21	Junio C Hamano	Merge branch 'gv/portable'	commit \| commitdiff \| tree
2010-06-21	Junio C Hamano	Merge branch 'bc/portable'	commit \| commitdiff \| tree
2010-06-21	Junio C Hamano	Merge branch 'jn/gitweb-fastcgi'	commit \| commitdiff \| tree
2010-06-21	Junio C Hamano	Merge branch 'jn/checkout-doc'	commit \| commitdiff \| tree
2010-06-21	Junio C Hamano	Merge branch 'em/checkout-orphan'	commit \| commitdiff \| tree
2010-06-21	Junio C Hamano	Drop items that are 1.7.1.1 fixes from the 1.7.1 release...	commit \| commitdiff \| tree
2010-06-21	Junio C Hamano	Merge branch 'maint'	commit \| commitdiff \| tree
2010-06-21	Junio C Hamano	Update draft release notes to 1.7.1.1 Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2010-06-21	Junio C Hamano	Merge branch 'mc/maint-zoneparse' into maint	commit \| commitdiff \| tree
2010-06-21	Junio C Hamano	Merge branch 'jk/diff-m-doc' into maint	commit \| commitdiff \| tree
2010-06-21	Junio C Hamano	Merge branch 'jn/maint-doc-ignore' into maint	commit \| commitdiff \| tree
2010-06-21	Junio C Hamano	Merge branch 'bs/userdiff-php' into maint	commit \| commitdiff \| tree
2010-06-21	Junio C Hamano	Merge branch 'jk/maint-sha1-file-name-fix' into maint	commit \| commitdiff \| tree
2010-06-21	Junio C Hamano	Merge branch 'jk/maint-pull-dry-run-noop' into maint	commit \| commitdiff \| tree
2010-06-21	Junio C Hamano	Merge branch 'bw/diff-metainfo-color' into maint	commit \| commitdiff \| tree
2010-06-21	Junio C Hamano	Merge branch 'cb/assume-unchanged-fix' into maint	commit \| commitdiff \| tree
2010-06-21	Junio C Hamano	Merge branch 'jn/notes-doc' into maint	commit \| commitdiff \| tree
2010-06-21	Junio C Hamano	Merge branch 'ab/test-cleanup' into maint	commit \| commitdiff \| tree
2010-06-21	Junio C Hamano	Merge branch 'rs/diff-no-minimal' into maint	commit \| commitdiff \| tree
2010-06-21	Junio C Hamano	Merge branch 'bg/apply-blank-trailing-context' into...	commit \| commitdiff \| tree
2010-06-21	Junio C Hamano	Merge branch 'maint'	commit \| commitdiff \| tree
2010-06-21	Ævar Arnfjörð Bjarmason	git-cvsserver: fix error for invalid password formats Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2010-06-21	Ævar Arnfjörð Bjarmason	git-cvsserver: typo in a comment: bas -> has Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2010-06-20	Jay Soffian	gitweb/Makefile: fix typo in gitweb.min.css rule Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2010-06-18	Clément Poulain	t/t8007: test textconv support for cat-file Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2010-06-18	Clément Poulain	textconv: support for cat_file Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2010-06-18	Junio C Hamano	Update draft release notes to 1.7.2 Signed-off-by: Junio C Hamano <gitster@pobox.com>	commit \| commitdiff \| tree
2010-06-18	Junio C Hamano	Merge branch 'cc/maint-diff-CC-binary'	commit \| commitdiff \| tree
2010-06-18	Junio C Hamano	Merge branch 'by/diff-graph'	commit \| commitdiff \| tree
2010-06-18	Junio C Hamano	Merge branch 'cb/ls-files-cdup'	commit \| commitdiff \| tree
2010-06-18	Junio C Hamano	Merge branch 'jc/t9129-any-utf8'	commit \| commitdiff \| tree
2010-06-18	Junio C Hamano	Merge branch 'rr/am-help'	commit \| commitdiff \| tree
next

git with Jakub Narębski modifications

RSS Atom