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