Code

tag: do not show non-tag contents with "-n"
[git.git] / merge-file.h
2011-12-14 Junio C HamanoMerge branch 'jk/maint-fetch-status-table' into maint...
2011-12-14 Junio C HamanoMerge branch 'jc/maint-name-rev-all' into maint-1.7.6
2011-12-14 Junio C HamanoMerge branch 'ml/mailmap' into maint-1.7.6
2011-10-26 Junio C HamanoMerge branch 'ps/gitweb-js-with-lineno' into maint...
2011-10-26 Junio C HamanoMerge branch 'maint-1.7.5' into maint-1.7.6
2011-09-23 Junio C HamanoMerge branch 'mh/check-ref-format-print-normalize'...
2011-09-23 Junio C HamanoMerge branch 'gb/maint-am-patch-format-error-message...
2011-09-12 Junio C HamanoMerge branch 'jk/tag-contains-ab' (early part) into...
2011-09-12 Junio C HamanoMerge branch 'jk/maint-config-param' into maint
2011-09-12 Junio C HamanoMerge branch 'jk/maint-1.7.2-status-ignored' into maint
2011-08-23 Junio C HamanoMerge branch 'jc/maint-combined-diff-work-tree' into...
2011-08-16 Junio C HamanoMerge branch 'jk/tag-list-multiple-patterns' into maint
2011-08-16 Junio C HamanoMerge branch 'jl/submodule-add-relurl-wo-upstream'...
2011-08-16 Junio C HamanoMerge branch 'jk/fast-export-quote-path' into maint
2011-08-16 Junio C HamanoMerge branch 'bw/log-all-ref-updates-doc' into maint
2011-08-16 Junio C HamanoMerge branch 'js/maint-add-path-stat-pwd' into maint
2011-08-16 Junio C HamanoMerge branch 'jn/mime-type-with-params' into maint
2011-08-16 Junio C HamanoMerge branch 'jc/submodule-sync-no-auto-vivify' into...
2011-08-16 Junio C HamanoMerge branch 'jc/zlib-wrap' into maint
2011-08-16 Junio C HamanoMerge branch 'bc/submodule-foreach-stdin-fix-1.7.4...
2011-08-16 Junio C HamanoMerge branch 'jc/diff-index-quick-exit-early' into...
2011-08-01 Junio C HamanoMerge branch 'nk/ref-doc' into maint
2011-08-01 Junio C HamanoMerge branch 'jl/maint-fetch-recursive-fix' into maint
2011-08-01 Junio C HamanoMerge branch 'jc/maint-cygwin-trust-executable-bit...
2011-08-01 Junio C HamanoMerge branch 'jc/legacy-loose-object' into maint
2011-08-01 Junio C HamanoMerge branch 'an/shallow-doc' into maint
2011-08-01 Junio C HamanoMerge branch 'jc/maint-1.7.3-checkout-describe' into...
2011-07-06 Junio C HamanoMerge commit 'v1.7.6' into jc/checkout-reflog-fix
2011-06-29 Junio C HamanoMerge branch 'maint-1.7.5' into maint
2011-06-29 Junio C HamanoMerge branch 'jn/maint-doc-dashdash' into jn/doc-dashdash
2011-06-26 Junio C HamanoMerge branch 'maint'
2011-06-22 Junio C HamanoMerge branch 'maint'
2011-06-21 Junio C HamanoMerge branch 'maint'
2011-06-20 Junio C HamanoMerge branch 'mk/grep-pcre'
2011-06-19 Junio C HamanoMerge branch 'maint'
2011-06-09 Junio C HamanoMerge branch 'maint'
2011-06-07 Junio C HamanoMerge branch 'jc/magic-pathspec'
2011-06-06 Junio C HamanoMerge branch 'jn/mime-type-with-params'
2011-06-06 Junio C HamanoMerge branch 'jk/diff-not-so-quick'
2011-06-06 Junio C HamanoMerge branch 'bc/maint-status-z-to-use-porcelain'
2011-06-01 Junio C HamanoSync with 1.7.5.4 v1.7.6-rc0
2011-05-31 Junio C HamanoMerge branch 'jk/format-patch-am'
2011-05-31 Junio C HamanoMerge branch 'jn/doc-remote-helpers'
2011-05-31 Junio C HamanoMerge branch 'jc/log-quiet-fix'
2011-05-31 Junio C HamanoMerge branch 'kk/maint-prefix-in-config-mak'
2011-05-31 Junio C HamanoMerge branch 'jk/maint-docs'
2011-05-31 Junio C HamanoMerge branch 'jk/read-in-full-stops-on-error'
2011-05-31 Junio C HamanoMerge branch 'jk/maint-remote-mirror-safer'
2011-05-31 Junio C HamanoSync with maint
2011-05-31 Junio C HamanoMerge branch 'jc/fmt-req-fix'
2011-05-31 Junio C HamanoMerge branch 'jk/maint-config-alias-fix'
2011-05-30 Junio C HamanoMerge branch 'maint'
2011-05-30 Junio C HamanoMerge branch 'mk/grep-pcre'
2011-05-30 Junio C HamanoMerge branch 'jk/haves-from-alternate-odb'
2011-05-26 Junio C HamanoMerge branch 'jn/userdiff-perl-updates'
2011-05-26 Junio C HamanoMerge branch 'rg/no-gecos-in-pwent'
2011-05-26 Junio C HamanoMerge branch 'jk/fetch-mark-complete-optimization'
2011-05-26 Junio C HamanoMerge branch 'jn/gitweb-js'
2011-05-26 Junio C HamanoMerge branch 'jc/require-work-tree-exists'
2011-05-26 Junio C HamanoSync with 1.7.5.3
2011-05-25 Junio C HamanoMerge branch 'jc/bigfile'
2011-05-25 Junio C HamanoMerge branch 'maint'
2011-05-23 Junio C HamanoMerge branch 'tr/add-i-no-escape'
2011-05-23 Junio C HamanoMerge branch 'jm/maint-diff-words-with-sbe'
2011-05-23 Junio C HamanoMerge branch 'js/mingw-shutdown'
2011-05-23 Junio C HamanoMerge branch 'jc/magic-pathspec'
2011-05-21 Junio C HamanoMerge branch 'maint'
2011-05-20 Junio C HamanoMerge branch 'jc/maint-1.7.4-pathspec-stdin-and-cmdline'
2011-05-20 Junio C HamanoMerge branch 'rg/copy-gecos-username'
2011-05-20 Junio C HamanoMerge branch 'jl/submodule-conflicted-gitmodules'
2011-05-20 Junio C HamanoMerge branch 'ld/p4-preserve-user-names'
2011-05-20 Junio C HamanoMerge branch 'ms/tagname-does-not-begin-with-dash'
2011-05-20 Junio C HamanoMerge branch 'jk/git-connection-deadlock-fix'
2011-05-20 Junio C HamanoMerge branch 'js/maint-send-pack-stateless-rpc-deadlock...
2011-05-20 Junio C HamanoMerge branch 'jk/cherry-pick-root-with-resolve'
2011-05-20 Junio C HamanoMerge branch 'jc/maint-pathspec-stdin-and-cmdline'
2011-05-20 Junio C HamanoMerge 1.7.5.2 in
2011-05-16 Junio C HamanoMerge branch 'ci/commit--interactive-atomic'
2011-05-16 Junio C HamanoMerge branch 'kk/maint-prefix-in-config-mak'
2011-05-16 Junio C HamanoMerge branch 'mg/merge-ff-config'
2011-05-16 Junio C HamanoMerge branch 'maint'
2011-05-15 Junio C HamanoMerge branch 'maint'
2011-05-15 Junio C HamanoMerge branch 'maint'
2011-05-13 Junio C HamanoMerge branch 'bf/commit-template-no-cleanup'
2011-05-13 Junio C HamanoMerge branch 'jc/t1506-shell-param-expansion-gotcha'
2011-05-13 Junio C HamanoMerge branch 'rr/rerere-libify-clear-gc'
2011-05-13 Junio C HamanoMerge branch 'js/maint-send-pack-stateless-rpc-deadlock...
2011-05-13 Junio C HamanoMerge branch 'jc/fix-add-u-unmerged'
2011-05-13 Junio C HamanoMerge branch 'jn/setup-revisions-glob-and-friends-passthru'
2011-05-13 Junio C HamanoMerge branch 'cn/log-parse-opt'
2011-05-13 Junio C HamanoMerge branch 'maint'
2011-05-13 Junio C HamanoMerge branch 'nd/struct-pathspec'
2011-05-11 Junio C HamanoMerge branch 'jn/gitweb-dependency'
2011-05-11 Junio C HamanoMerge branch 'jc/maint-branch-mergeoptions'
2011-05-11 Junio C HamanoMerge branch 'jn/maint-test-merge-verify-parents'
2011-05-11 Junio C HamanoMerge branch 'vh/config-interactive-singlekey-doc'
2011-05-11 Junio C HamanoMerge branch 'jc/maint-add-p-overlapping-hunks'
2011-05-11 Junio C HamanoMerge branch 'sr/maint-fast-import-tighten-option-parsing'
2011-05-10 Junio C HamanoMerge branch 'fc/completion-zsh' into sg/completion...
2011-05-06 Junio C HamanoMerge branch 'jn/run-command-error-failure'
next