mergetools: simplify how we handle "vim" and "defaults"
[git] / notes.c
2012-10-17  Junio C HamanoMerge tag 'gitgui-0.17.0' of git://repo.or.cz/git-gui
2012-10-17  Junio C HamanoSync with 1.7.12.4
2012-10-16  Junio C HamanoMerge branch 'jk/maint-http-half-auth-push'
2012-10-14  Junio C HamanoMerge branch 'maint'
2012-10-12  Junio C HamanoMerge branch 'maint'
2012-10-10  Junio C HamanoMerge branch 'rr/git-uri-doc'
2012-10-10  Junio C HamanoMerge branch 'bw/cp-a-is-gnuism'
2012-10-10  Junio C HamanoMerge branch 'nd/doc-ignore'
2012-10-10  Junio C HamanoMerge branch 'jc/doc-long-options'
2012-10-10  Junio C HamanoSync with maint
2012-10-09  Junio C HamanoMerge branch 'maint'
2012-10-08  Junio C HamanoMerge branch 'jc/maint-t1450-fsck-order-fix'
2012-10-08  Junio C HamanoMerge branch 'jc/merge-bases-paint-fix'
2012-10-08  Junio C HamanoSync with 1.7.12.3
2012-10-08  Junio C HamanoMerge branch 'os/commit-submodule-ignore' into maint
2012-10-03  Junio C HamanoMerge branch 'lt/mailinfo-handle-attachment-more-sanely'
2012-10-02  Junio C HamanoMerge branch 'maint'
2012-10-01  Junio C HamanoMerge branch 'jk/completion-tests'
2012-10-01  Junio C HamanoMerge branch 'ep/malloc-check-perturb'
2012-10-01  Junio C HamanoMerge branch 'da/mergetool-custom'
2012-10-01  Junio C HamanoMerge branch 'os/commit-submodule-ignore'
2012-10-01  Junio C HamanoMerge branch 'jc/blame-follows-renames'
2012-10-01  Junio C HamanoMerge branch 'jk/receive-pack-unpack-error-to-pusher'
2012-10-01  Junio C HamanoMerge branch 'rt/maint-clone-single'
2012-09-30  Junio C HamanoMerge git://github.com/git-l10n/git-po
2012-09-30  Junio C HamanoSync with 1.7.12.2
2012-09-30  Junio C HamanoMerge branch 'rr/maint-submodule-unknown-cmd'
2012-09-30  Junio C HamanoMerge branch 'rs/archive-zip-utf8'
2012-09-30  Junio C HamanoMerge branch 'jk/smart-http-switch'
2012-09-30  Junio C HamanoMerge branch 'sp/maint-http-enable-gzip'
2012-09-30  Junio C HamanoMerge branch 'sp/maint-http-info-refs-no-retry'
2012-09-30  Junio C HamanoMerge branch 'aw/rebase-i-edit-todo'
2012-09-30  Junio C HamanoMerge branch 'js/rebase-exec-command-not-found'
2012-09-30  Junio C HamanoMerge branch 'rr/test-use-shell-path-not-shell'
2012-09-25  Junio C HamanoMerge branch 'rr/test-make-sure-we-have-git'
2012-09-25  Junio C HamanoMerge branch 'js/hp-nonstop'
2012-09-25  Junio C HamanoMerge branch 'js/poll-emu'
2012-09-25  Junio C HamanoMerge branch 'ep/malloc-check-perturb'
2012-09-25  Junio C HamanoMerge branch 'aj/xfuncname-ada'
2012-09-25  Junio C HamanoMerge branch 'jc/maint-mailinfo-mime-attr'
2012-09-25  Junio C HamanoMerge branch 'po/maint-docs'
2012-09-25  Junio C HamanoMerge branch 'db/doc-custom-xmlto'
2012-09-25  Junio C HamanoMerge branch 'maint'
2012-09-24  Junio C HamanoSync with maint
2012-09-21  Junio C HamanoMerge branch 'mh/fetch-filter-refs'
2012-09-21  Junio C HamanoMerge branch 'jc/maint-log-grep-all-match-1'
2012-09-20  Junio C HamanoMerge branch 'maint'
2012-09-18  Junio C HamanoMerge branch 'jc/maint-log-grep-all-match'
2012-09-18  Junio C HamanoMerge branch 'jc/make-static'
2012-09-18  Junio C HamanoMerge branch 'er/doc-fast-import-done' into maint
2012-09-16  Junio C Hamanonotes.c: mark a private file-scope symbol as static
2012-09-15  Junio C HamanoMerge branch 'da/gitk-reload-tag-contents' into maint...
2012-09-12  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2012-09-12  Junio C HamanoMerge branch 'da/gitk-reload-tag-contents'
2012-09-11  Junio C HamanoMerge branch 'jc/maint-t7406-rev-parse-max-count-huh...
2012-08-27  Junio C HamanoMerge branch 'jc/maint-t7406-rev-parse-max-count-huh'
2012-08-24  Junio C HamanoMerge branch 'lp/no-cmd-http-fetch' into maint-1.7.11
2012-08-06  Junio C HamanoMerge branch 'jn/block-sha1' into maint
2012-08-06  Junio C HamanoMerge branch 'ms/daemon-doc-typo' into maint
2012-08-06  Junio C HamanoMerge branch 'lm/git-blame-el' into maint
2012-08-06  Junio C HamanoMerge branch 'jk/maint-checkout-orphan-check-fix' into...
2012-07-28  Junio C HamanoMerge branch 'jk/maint-checkout-orphan-check-fix'
2012-07-24  Junio C HamanoMerge branch 'jn/block-sha1'
2012-07-22  Junio C HamanoMerge branch 'jk/maint-commit-amend-only-no-paths'...
2012-07-22  Junio C HamanoMerge branch 'tg/maint-cache-name-compare' into maint
2012-07-22  Junio C HamanoMerge branch 'ms/daemon-doc-typo'
2012-07-16  Junio C HamanoMerge branch 'tg/maint-cache-name-compare'
2012-07-16  Junio C HamanoMerge branch 'jk/maint-commit-amend-only-no-paths'
2012-07-11  Junio C HamanoMerge branch 'tg/maint-cache-name-compare' into tg...
2012-06-25  Junio C HamanoMerge branch 'lp/no-cmd-http-fetch'
2012-06-25  Junio C HamanoMerge branch 'lm/git-blame-el'
2012-06-17  Junio C HamanoMerge branch 'js/maint-fast-export-mark-error' into...
2012-06-12  Junio C HamanoMerge branch 'js/maint-fast-export-mark-error'
2012-06-03  Junio C HamanoMerge branch 'ef/maint-rebase-error-message' into maint
2012-06-01  Junio C HamanoMerge branch 'ef/maint-rebase-error-message'
2012-05-23  Junio C HamanoMerge branch 'js/rev-parse-doc-fix'
2012-05-23  Junio C HamanoMerge branch 'js/rebase-i-p-test-fix'
2012-04-26  Junio C HamanoMerge branch 'rs/combine-diff-zero-context-at-the-begin...
2012-04-26  Junio C HamanoMerge branch 'jk/add-p-skip-conflicts' into maint
2012-04-20  Junio C HamanoMerge branch 'jb/am-include'
2012-04-16  Junio C HamanoMerge branch 'jk/add-p-skip-conflicts'
2012-04-16  Junio C HamanoMerge branch 'rs/combine-diff-zero-context-at-the-begin...
2012-04-10  David A. GreeneAdd 'contrib/subtree/' from commit 'd3a04e06c77d57978bb...
2012-04-02  Junio C HamanoMerge branch 'pt/gitk'
2012-03-26  Junio C HamanoMerge branch 'jn/maint-fast-import-empty-ls' into maint
2012-03-24  Junio C HamanoMerge gitk changes from Paul Mackerras at git://ozlabs...
2012-03-16  Junio C HamanoMerge "two fixes for fast-import's 'ls' command" from...
2012-03-16  Junio C HamanoMerge branch 'th/doc-diff-submodule-option'
2012-03-12  Junio C HamanoMerge branch 'jc/maint-diff-patch-header' into maint
2012-03-06  Junio C HamanoMerge branch 'jc/maint-diff-patch-header'
2012-02-27  Junio C HamanoMerge branch 'pj/remote-set-branches-usage-fix' into...
2012-02-23  Junio C HamanoMerge branch 'pj/remote-set-branches-usage-fix'
2012-02-16  Junio C HamanoMerge branch 'mm/empty-loose-error-message' into maint
2012-02-13  Junio C HamanoMerge branch 'mm/empty-loose-error-message'
2012-01-29  Junio C HamanoMerge branch 'rs/diff-postimage-in-context'
2012-01-29  Junio C HamanoMerge branch 'tr/maint-mailinfo'
2012-01-27  Junio C HamanoMerge branch 'svn-fe' of git://repo.or.cz/git/jrn into...
2012-01-13  Junio C HamanoMerge branch 'tr/maint-mailinfo'
2012-01-09  Junio C HamanoMerge branch 'mm/maint-gitweb-project-maxdepth'
2011-12-28  Junio C HamanoMerge branch 'jv/maint-config-set' into maint
next