Merge branch 'maint'
[gitweb.git] / Documentation / merge-options.txt
2013-06-11 Merge branch 'maint'
2013-06-11 Merge branch 'maint-1.8.2' into maint
2013-06-11 Merge branch 'cm/gitweb-project-list-persistent-cgi...
2013-06-11 Merge branch 'rr/maint-fetch-tag-doc-asterisks'
2013-06-11 Merge branch 'rr/rebase-autostash'
2013-06-11 Merge branch 'jk/test-exit-code-by-signal'
2013-06-11 Merge branch 'fc/at-head'
2013-06-11 Merge branch 'ar/wildmatch-foldcase'
2013-06-11 Merge branch 'tr/sha1-file-silence-loose-object-info...
2013-06-11 Merge branch 'nd/warn-ambiguous-object-name'
2013-06-11 Merge branch 'rr/diffcore-pickaxe-doc'
2013-06-11 Merge branch 'cr/git-work-tree-sans-git-dir'
2013-06-11 Merge branch 'mm/mediawiki-https-fail-message'
2013-06-11 Merge branch 'cb/log-follow-with-combined'
2013-06-11 Merge branch 'xq/credential-osxkeychain'
2013-06-11 Merge branch 'fc/do-not-use-the-index-in-add-to-index'
2013-06-11 Merge branch 'fc/remote-bzr'
2013-06-11 Merge branch 'fc/remote-hg'
2013-06-11 Merge branch 'rj/mingw-cygwin'
2013-06-11 Merge branch 'fc/completion-less-ls-remote'
2013-06-11 Merge branch 'tr/test-commit-only-on-orphan'
2013-06-11 Merge branch 'rs/unpack-trees-plug-leak'
2013-06-11 Merge branch 'rr/die-on-missing-upstream'
2013-06-10 Sync with 1.8.3.1
2013-06-10 Merge branch 'jn/config-ignore-inaccessible' into maint
2013-06-06 Merge branch 'rj/mingw-compat-st-mode-bits'
2013-06-06 Merge branch 'sb/archive-zip-double-assignment-fix'
2013-06-06 Merge branch 'rr/push-head'
2013-06-06 Merge branch 'ks/difftool-dir-diff-copy-fix'
2013-06-06 Merge branch 'fc/show-branch-in-rebase-am'
2013-06-06 Merge branch 'nd/clone-connectivity-shortcut'
2013-06-06 Merge branch 'nd/prune-packed-dryrun-verbose'
2013-06-06 Merge branch 'fc/transport-helper-no-refspec'
2013-06-05 Merge branch 'rs/commit-m-no-edit'
2013-06-05 Merge branch 'fc/send-email-chainreplyto-warning'
2013-06-05 Merge branch 'fc/cleanups'
2013-06-05 Merge branch 'fc/makefile'
2013-06-05 Merge branch 'nd/urls-doc-no-file-hyperlink-fix'
2013-06-05 Merge branch 'tr/push-no-verify-doc'
2013-06-05 Merge branch 'tg/maint-zsh-svn-remote-prompt'
2013-06-05 Merge branch 'th/bisect-skip-report-range-fix'
2013-06-05 Merge branch 'dm/unbash-subtree'
2013-06-05 Merge branch 'rr/zsh-color-prompt'
2013-06-05 Merge branch 'jc/core-checkstat'
2013-06-04 Merge branch 'maint'
2013-06-03 Sync with maint
2013-06-03 Merge branch 'kb/status-ignored-optim-2'
2013-06-02 Merge branch 'tr/line-log'
2013-06-02 Merge branch 'mc/describe-first-parent'
2013-06-02 Merge branch 'rs/tar-tests'
2013-06-02 Merge branch 'jc/strbuf-branchname-fix'
2013-06-02 Merge branch 'jk/fetch-always-update-tracking'
2013-06-02 Merge branch 'tr/coverage'
2013-06-02 Merge branch 'mk/combine-diff-context-horizon-fix'
2013-06-02 Merge branch 'kb/ancestry-path-threedots'
2013-06-02 Merge branch 'jc/t5551-posix-sed-bre'
2013-06-02 Merge branch 'da/darwin'
2013-06-02 Merge branch 'fc/macos-x-clipped-write'
2013-06-02 Merge branch 'vv/help-unknown-ref'
2013-06-02 Merge branch 'nd/clone-local-with-colon'
2013-06-02 Merge branch 'fc/fast-export-persistent-marks'
2013-06-02 Merge branch 'rs/empty-archive'
2013-06-02 Merge branch 'rh/merge-options-doc-fix'
2013-06-02 Merge branch 'an/diff-index-doc'
2013-05-29 Merge branch 'maint-1.8.2' into maint
2013-05-29 Merge branch 'jn/config-ignore-inaccessible'
2013-05-29 Merge branch 'jk/lookup-object-prefer-latest'
2013-05-29 Merge branch 'jk/subtree-do-not-push-if-split-fails'
2013-05-29 Merge branch 'jk/test-output'
2013-05-29 Merge branch 'mh/packed-refs-various'
2013-05-29 Merge branch 'as/check-ignore'
2013-05-29 Merge branch 'jc/prune-all'
2013-05-17 Merge branch 'dw/asciidoc-sources-are-dot-txt-files'
2013-05-17 Merge git://ozlabs.org/~paulus/gitk
2013-05-16 Documentation/merge-options.txt: restore `-e` option
2013-05-13 Merge git://ozlabs.org/~paulus/gitk
2013-05-09 Sync with v1.8.2.3
2013-05-09 Merge branch 'tr/copy-revisions-from-stdin' into maint
2013-05-07 Merge branch 'jk/merge-tree-added-identically'
2013-05-05 Merge branch 'fc/push-with-export-reporting-result'
2013-05-03 Merge branch 'tr/unpack-entry-use-after-free-fix'
2013-05-03 Sync with maint
2013-05-01 Merge branch 'hb/git-pm-tempfile'
2013-05-01 Merge branch 'rs/pp-user-info-without-extra-allocation'
2013-05-01 Merge branch 'tr/remote-tighten-commandline-parsing'
2013-05-01 Merge branch 'zk/prompt-rebase-step'
2013-04-29 Merge branch 'maint'
2013-04-28 Merge branch 'maint'
2013-04-28 Merge branch 'jk/check-corrupt-objects-carefully'
2013-04-28 Merge branch 'jk/merge-tree-added-identically'
2013-04-26 Merge branch 'rr/shortlog-doc'
2013-04-26 Merge branch 'ph/rebase-original'
2013-04-26 Merge branch 'jn/glossary-revision'
2013-04-26 Sync with 1.8.2.2
2013-04-26 Merge branch 'rt/commentchar-fmt-merge-msg' into maint
2013-04-26 Merge branch 'rs/empty-archive' into maint
2013-04-26 Merge branch 'pe/pull-rebase-v-q' into maint
2013-04-24 Sync with maint
2013-04-24 Merge branch 'jk/diff-algo-finishing-touches' into...
2013-04-24 Merge branch 'sr/log-SG-no-textconv' into maint
next