git-mergetool: check return value from read
[git/git.git] / git-mergetool--lib.sh
2011-09-20 Jay Soffiangit-mergetool: check return value from read
2011-09-12 Junio C HamanoMerge branch 'jk/tag-contains-ab' (early part) into...
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/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 'bc/submodule-foreach-stdin-fix-1.7.4...
2011-08-01 Junio C HamanoMerge branch 'jc/legacy-loose-object' 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-07-06 Junio C HamanoMerge commit 'v1.7.0' into jc/checkout-reflog-fix
2011-06-29 Junio C HamanoMerge branch 'jn/maint-doc-dashdash' into jn/doc-dashdash
2011-06-24 Junio C HamanoMerge branch 'maint-1.7.4' into maint
2011-06-20 Junio C HamanoMerge branch 'mk/grep-pcre'
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 HamanoMerge branch 'jk/maint-config-alias-fix' into maint
2011-06-01 Junio C HamanoMerge branch 'kk/maint-prefix-in-config-mak' into maint
2011-05-31 Junio C HamanoMerge branch 'jk/format-patch-am'
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-remote-mirror-safer'
2011-05-31 Junio C HamanoMerge branch 'vh/config-interactive-singlekey-doc'...
2011-05-31 Junio C HamanoMerge branch 'ml/test-readme' into maint
2011-05-31 Junio C HamanoMerge branch 'ab/i18n-fixup' into maint
2011-05-31 Junio C HamanoMerge branch 'jc/rename-degrade-cc-to-c' into maint
2011-05-31 Junio C HamanoMerge branch 'rr/doc-content-type' into maint
2011-05-31 Junio C HamanoMerge remote-tracking branch 'ko/maint' into jc/diff...
2011-05-31 Junio C HamanoMerge branch 'jk/maint-config-alias-fix'
2011-05-30 Junio C HamanoMerge branch 'jm/maint-misc-fix' into maint
2011-05-30 Junio C HamanoMerge branch 'mk/grep-pcre'
2011-05-30 Junio C HamanoMerge branch 'jn/run-command-error-failure' into maint
2011-05-26 Junio C HamanoMerge branch 'rg/no-gecos-in-pwent'
2011-05-26 Junio C HamanoMerge branch 'jn/gitweb-js'
2011-05-26 Junio C HamanoMerge branch 'jn/ctags-more'
2011-05-26 Junio C HamanoMerge branch 'jc/require-work-tree-exists'
2011-05-26 Junio C HamanoMerge branch 'maint-1.7.4' into maint
2011-05-26 Junio C HamanoMerge branch 'jk/git-connection-deadlock-fix' into...
2011-05-26 Junio C HamanoMerge branch 'js/maint-send-pack-stateless-rpc-deadlock...
2011-05-26 Junio C HamanoMerge branch 'jm/maint-diff-words-with-sbe' into maint
2011-05-26 Junio C HamanoMerge branch 'kk/maint-prefix-in-config-mak' into maint
2011-05-26 Junio C HamanoMerge branch 'mg/diff-uiconfig-doc' into maint
2011-05-26 Junio C HamanoMerge branch 'ft/gitweb-tar-with-gzip-n' into maint
2011-05-26 Junio C HamanoMerge branch 'ss/doc-svn' into maint
2011-05-26 Junio C HamanoMerge branch 'jn/format-patch-doc' into maint
2011-05-26 Junio C HamanoMerge branch 'jc/maint-pathspec-stdin-and-cmdline'...
2011-05-26 Junio C HamanoMerge branch 'rg/copy-gecos-username' into maint
2011-05-26 Junio C HamanoMerge branch 'fc/completion-zsh' into maint
2011-05-26 Junio C HamanoMerge branch 'jk/git-connection-deadlock-fix' into...
2011-05-26 Junio C HamanoMerge branch 'js/maint-send-pack-stateless-rpc-deadlock...
2011-05-26 Junio C HamanoMerge branch 'svn-fe-maint' of git://repo.or.cz/git...
2011-05-25 Junio C HamanoMerge branch 'jc/bigfile'
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-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 '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 'jc/maint-pathspec-stdin-and-cmdline'
2011-05-17 Junio C HamanoMerge branch 'js/maint-1.6.6-send-pack-stateless-rpc...
2011-05-16 Junio C HamanoMerge branch 'ci/commit--interactive-atomic'
2011-05-16 Junio C HamanoMerge branch 'sg/completion-updates'
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 'jn/maint-format-patch-doc' into maint
2011-05-16 Junio C HamanoMerge branch 'ss/cherry-pick-x-doc' into maint
2011-05-16 Junio C HamanoMerge branch 'vr/merge-base-doc' into maint
2011-05-16 Junio C HamanoMerge branch 'sr/maint-fast-import-tighten-option-parsi...
2011-05-16 Junio C HamanoMerge branch 'jc/t1506-shell-param-expansion-gotcha...
2011-05-16 Junio C HamanoMerge branch 'jc/fix-add-u-unmerged' into maint
2011-05-16 Junio C HamanoMerge branch 'jn/gitweb-dependency' into maint
2011-05-16 Junio C HamanoMerge branch 'jc/maint-branch-mergeoptions' into maint
2011-05-16 Junio C HamanoMerge branch 'jc/maint-add-p-overlapping-hunks' into...
2011-05-15 Junio C HamanoMerge branch 'cn/format-patch-quiet' into maint
2011-05-15 Junio C HamanoMerge branch 'jm/mergetool-submodules' into maint
2011-05-15 Junio C HamanoMerge branch 'jk/format-patch-quote-special-in-from...
2011-05-15 Junio C HamanoMerge branch 'vh/git-svn-doc' into 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 'jh/dirstat-lines'
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 'aw/maint-rebase-i-p-no-ff' into maint
2011-05-13 Junio C HamanoMerge branch 'js/blame-parsename' into maint
2011-05-13 Junio C HamanoMerge branch 'gr/cvsimport-alternative-cvspass-location...
2011-05-13 Junio C HamanoMerge branch 'cj/p4merge' into maint
2011-05-13 Junio C HamanoMerge branch 'jk/merge-one-file-working-tree' into...
2011-05-13 Junio C HamanoMerge branch 'jc/fix-diff-files-unmerged' into maint
2011-05-13 Junio C HamanoMerge branch 'mz/maint-rename-unmerged' into maint
next