Merge branch 'ms/daemon-doc-typo' into maint
[gitweb.git] / mergetools / bc3
2012-08-06 Merge branch 'ms/daemon-doc-typo' into maint
2012-08-06 Merge branch 'lm/git-blame-el' into maint
2012-08-06 Merge branch 'rs/git-blame-mapcar-mapc' into maint
2012-08-06 Merge branch 'jk/maint-checkout-orphan-check-fix' into...
2012-07-30 Merge branch 'jc/maint-filter-branch-epoch-date' into...
2012-07-22 Merge branch 'jk/maint-commit-amend-only-no-paths'...
2012-07-22 Merge branch 'tg/maint-cache-name-compare' into maint
2012-07-22 Merge branch 'jc/refactor-diff-stdin' into maint
2012-07-22 Merge branch 'cw/no-detaching-an-unborn' into maint
2012-07-11 Merge branch 'jc/maint-blame-unique-abbrev' into maint
2012-06-17 Merge branch 'js/maint-fast-export-mark-error' into...
2012-06-12 Merge branch 'js/maint-fast-export-mark-error'
2012-06-03 Merge branch 'ef/maint-rebase-error-message' into maint
2012-06-01 Merge branch 'ef/maint-rebase-error-message'
2012-06-01 Merge branch 'ef/http-o-depends-on-gvf' into maint
2012-06-01 Merge branch 'rs/maint-grep-F' into maint
2012-05-25 Merge branch 'rs/maint-grep-F'
2012-05-23 Merge branch 'js/rev-parse-doc-fix'
2012-05-23 Merge branch 'js/rebase-i-p-test-fix'
2012-05-14 Merge branch 'jk/maint-reflog-walk-count-vs-time' into...
2012-05-14 Merge branch 'ef/checkout-empty' into maint
2012-05-14 Merge branch 'jk/maint-tformat-with-z' into maint
2012-05-11 Merge branch 'ef/checkout-empty'
2012-05-11 Merge branch 'jk/maint-reflog-walk-count-vs-time'
2012-05-11 Merge branch 'ah/maint-grep-double-init' into maint
2012-05-11 Merge branch 'fa/maint-config-doc' into maint
2012-05-10 Merge branch 'fa/maint-config-doc'
2012-05-10 Merge branch 'ah/maint-grep-double-init'
2012-05-08 Merge branch 'rs/maint-dir-strbuf' into rs/dir-strbuf
2012-05-07 Merge branch 'jk/maint-tformat-with-z'
2012-05-07 Merge branch 'jk/maint-gitweb-test-use-sane-perl' into...
2012-05-07 Merge branch 'ef/maint-1.7.6-clone-progress-fix' into...
2012-05-02 Merge branch 'jk/maint-gitweb-test-use-sane-perl'
2012-05-02 Merge branch 'lp/maint-diff-three-dash-with-graph'...
2012-04-26 Merge branch 'rs/combine-diff-zero-context-at-the-begin...
2012-04-26 Merge branch 'jk/add-p-skip-conflicts' into maint
2012-04-26 Sync with 1.7.7.7
2012-04-23 Merge branch 'lp/maint-diff-three-dash-with-graph'
2012-04-20 Merge branch 'jb/am-include'
2012-04-16 Merge branch 'jk/add-p-skip-conflicts'
2012-04-16 Merge branch 'rs/combine-diff-zero-context-at-the-begin...
2012-04-10 Add 'contrib/subtree/' from commit 'd3a04e06c77d57978bb...
2012-04-09 Merge branch 'cb/maint-t5541-make-server-port-portable...
2012-04-02 Merge branch 'pt/gitk'
2012-03-26 Merge branch 'jn/maint-fast-import-empty-ls' into maint
2012-03-26 Merge branch 'ms/maint-config-error-at-eol-linecount...
2012-03-24 Merge gitk changes from Paul Mackerras at git://ozlabs...
2012-03-16 Merge "two fixes for fast-import's 'ls' command" from...
2012-03-16 Merge branch 'th/doc-diff-submodule-option'
2012-03-13 Merge branch 'ms/maint-config-error-at-eol-linecount'
2012-03-12 Merge branch 'jc/maint-diff-patch-header' into maint
2012-03-12 Merge branch 'jn/maint-do-not-match-with-unsanitized...
2012-03-08 Merge branch 'jn/maint-do-not-match-with-unsanitized...
2012-03-06 Merge branch 'jc/maint-diff-patch-header'
2012-03-06 Merge branch 'maint-1.7.7' into maint-1.7.8
2012-03-05 Merge branch 'jn/maint-gitweb-invalid-regexp' into...
2012-03-05 Merge branch 'sp/smart-http-failure-to-push' into maint
2012-03-02 Merge branch 'rs/no-no-no-parseopt'
2012-03-01 Merge branch 'jn/maint-gitweb-invalid-regexp'
2012-02-27 Merge branch 'pj/remote-set-branches-usage-fix' into...
2012-02-27 Merge branch 'jn/ancient-meld-support' into maint
2012-02-27 Merge branch 'sp/smart-http-failure-to-push'
2012-02-23 Merge branch 'pj/remote-set-branches-usage-fix'
2012-02-21 Merge branch 'cb/maint-t5541-make-server-port-portable...
2012-02-20 Merge branch 'cb/maint-t5541-make-server-port-portable'
2012-02-16 Merge branch 'jc/checkout-out-of-unborn' into maint
2012-02-16 Merge branch 'jc/maint-mailmap-output' into maint
2012-02-16 Merge branch 'jc/maint-commit-ignore-i-t-a' into maint
2012-02-16 Merge branch 'mm/empty-loose-error-message' into maint
2012-02-14 Merge branch 'jn/ancient-meld-support'
2012-02-14 Merge branch 'jk/maint-tag-show-fixes' into maint
2012-02-13 Merge branch 'js/add-e-submodule-fix' into maint
2012-02-13 Merge branch 'jc/parse-date-raw' into maint
2012-02-13 Merge branch 'jc/checkout-out-of-unborn'
2012-02-13 Merge branch 'jc/maint-mailmap-output'
2012-02-13 Merge branch 'jc/maint-commit-ignore-i-t-a'
2012-02-13 Merge branch 'jk/maint-tag-show-fixes'
2012-02-13 Merge branch 'mm/empty-loose-error-message'
2012-02-10 Merge branch 'js/add-e-submodule-fix'
2012-02-10 Merge branch 'jc/parse-date-raw'
2012-02-10 Merge branch 'da/maint-mergetool-twoway' into maint
2012-02-06 Merge branch 'sp/smart-http-failure-to-push' into maint
2012-02-06 Merge branch 'jc/maint-log-first-parent-pathspec' into...
2012-02-06 Sync with 1.7.6.6
2012-02-06 Sync with 1.7.6.6
2012-02-01 Merge branch 'da/maint-mergetool-twoway'
2012-01-29 Merge branch 'rs/diff-postimage-in-context'
2012-01-29 Merge branch 'sp/smart-http-failure-to-push'
2012-01-29 Merge branch 'jc/maint-log-first-parent-pathspec'
2012-01-29 Merge branch 'tr/maint-mailinfo'
2012-01-27 Merge branch 'svn-fe' of git://repo.or.cz/git/jrn into...
2012-01-18 Merge branch 'maint-1.7.7' into maint
2012-01-18 Merge branch 'mh/maint-show-ref-doc'
2012-01-18 Merge branch 'tr/maint-word-diff-incomplete-line'
2012-01-13 Merge branch 'jc/request-pull-show-head-4'
2012-01-13 Merge branch 'tr/maint-mailinfo'
2012-01-13 Merge branch 'jk/maint-upload-archive'
2012-01-13 Merge branch 'maint-1.7.7' into maint
2012-01-13 Merge branch 'maint-1.7.6' into maint-1.7.7
2012-01-12 Merge branch 'maint-1.7.7' into maint
next