Merge branch 'ah/fix-http-push' into maint
[git] / contrib / examples / git-merge.sh
2014-07-22  Junio C HamanoMerge branch 'ah/fix-http-push' into maint
2014-07-22  Junio C HamanoMerge branch 'zk/log-graph-showsig' into maint
2014-07-22  Junio C HamanoMerge branch 'mg/fix-log-mergetag-color' into maint
2014-07-22  Junio C HamanoMerge branch 'lt/request-pull' into maint
2014-07-22  Junio C HamanoMerge branch 'ep/shell-assign-and-export-vars' into...
2014-07-22  Junio C HamanoMerge branch 'maint-1.9' into maint
2014-07-16  Junio C HamanoMerge branch 'jc/fix-clone-single-starting-at-a-tag...
2014-07-16  Junio C HamanoMerge branch 'rs/fix-alt-odb-path-comparison' into...
2014-07-16  Junio C HamanoMerge branch 'bc/fix-rebase-merge-skip' into maint
2014-07-16  Junio C HamanoMerge branch 'maint-1.9' into maint
2014-07-10  Junio C HamanoMerge branch 'jk/repack-pack-keep-objects' into maint
2014-07-10  Junio C HamanoMerge branch 'mc/doc-submodule-sync-recurse' into maint
2014-07-02  Junio C HamanoMerge branch 'maint-1.8.5' into maint
2014-06-25  Junio C HamanoMerge branch 'na/no-http-test-in-the-middle' into maint
2014-06-25  Junio C HamanoMerge branch 'jl/status-added-submodule-is-never-ignore...
2014-06-25  Junio C HamanoMerge branch 'ym/fix-opportunistic-index-update-race...
2014-06-25  Junio C HamanoMerge branch 'mk/show-s-no-extra-blank-line-for-merges...
2014-06-25  Junio C HamanoMerge branch 'rr/rebase-autostash-fix' into maint
2014-06-25  Junio C HamanoMerge branch 'jc/shortlog-ref-exclude' into maint
2014-06-25  Junio C HamanoMerge branch 'fc/rerere-conflict-style' into maint
2014-06-25  Junio C HamanoMerge branch 'dt/merge-recursive-case-insensitive'...
2014-06-25  Junio C HamanoMerge branch 'rs/mailinfo-header-cmp' into maint
2014-06-25  Junio C HamanoMerge branch 'jk/index-pack-report-missing' into maint
2014-06-25  Junio C HamanoMerge branch 'nd/index-pack-one-fd-per-thread' into...
2014-06-25  Junio C HamanoMerge branch 'sk/spawn-less-case-insensitively-from...
2014-06-25  Junio C HamanoMerge branch 'nd/daemonize-gc' into maint
2014-06-25  Junio C HamanoMerge branch 'jk/diff-follow-must-take-one-pathspec...
2014-06-25  Junio C HamanoMerge branch 'jk/diff-files-assume-unchanged' into...
2014-06-25  Junio C HamanoMerge branch 'jk/commit-C-pick-empty' into maint
2014-06-25  Junio C HamanoMerge branch 'bc/blame-crlf-test' into maint
2014-06-25  Junio C HamanoMerge branch 'jx/blame-align-relative-time' into maint
2014-06-25  Junio C HamanoMerge branch 'jc/apply-ignore-whitespace' into maint
2014-06-25  Junio C HamanoMerge branch 'ow/config-mailmap-pathname' into maint
2014-06-25  Junio C HamanoMerge branch 'jc/revision-dash-count-parsing' into...
2014-06-25  Junio C HamanoMerge branch 'jk/report-fail-to-read-objects-better...
2014-06-25  Junio C HamanoMerge branch 'je/pager-do-not-recurse' into maint
2014-06-12  Junio C HamanoMerge branch 'jc/rev-parse-argh-dashed-multi-words...
2014-05-30  Junio C HamanoSync with 1.9.4
2014-05-19  Junio C HamanoMerge branch 'rh/prompt-pcmode-avoid-eval-on-refname'
2014-05-19  Junio C HamanoMerge branch 'lt/request-pull'
2014-05-19  Junio C HamanoMerge branch 'jl/use-vsatisfy-correctly-for-2.0'
2014-05-19  Junio C HamanoMerge branch 'kb/fast-hashmap'
2014-05-13  Junio C HamanoMerge branch 'fc/prompt-zsh-read-from-file'
2014-05-09  Junio C HamanoSync with 1.9.3
2014-05-08  Junio C HamanoSync with maint
2014-05-08  Junio C HamanoMerge branch 'cl/p4-use-diff-tree' into maint
2014-05-07  Junio C HamanoMerge branch 'cl/p4-use-diff-tree'
2014-05-02  Junio C HamanoMerge branch 'mw/symlinks'
2014-05-02  Junio C HamanoMerge branch 'rh/prompt-pcmode-avoid-eval-on-refname'
2014-05-02  Junio C HamanoMerge branch 'mk/doc-git-gui-display-untracked'
2014-04-30  Junio C HamanoMerge git://github.com/git-l10n/git-po
2014-04-28  Junio C HamanoMerge branch 'db/make-with-curl'
2014-04-28  Junio C HamanoMerge branch 'jk/external-diff-use-argv-array' (early...
2014-04-24  Junio C HamanoMerge branch 'jk/pack-bitmap'
2014-04-24  Junio C HamanoMerge branch 'fc/transport-helper-sync-error-fix'
2014-04-24  Junio C HamanoMerge branch 'db/make-with-curl'
2014-04-21  Junio C HamanoMerge git://bogomips.org/git-svn
2014-04-21  Junio C HamanoMerge branch 'jx/i18n'
2014-04-21  Junio C HamanoMerge branch 'km/avoid-non-function-return-in-rebase'
2014-04-21  Junio C HamanoMerge branch 'ep/shell-command-substitution'
2014-04-17  Elia Pintogit-merge.sh: use the $( ... ) construct for command...
2014-04-09  Junio C HamanoMerge branch 'jk/commit-dates-parsing-fix' into maint
2014-04-09  Junio C HamanoMerge commit 'doc/http-backend: missing accent grave...
2014-04-08  Junio C HamanoMerge branch 'jk/commit-dates-parsing-fix'
2014-04-03  Junio C HamanoMerge branch 'mh/remove-subtree-long-pathname-fix'...
2014-04-03  Junio C HamanoMerge branch 'jc/stash-pop-not-popped' into maint
2014-03-31  Junio C HamanoMerge branch 'wt/doc-submodule-name-path-confusion-1'
2014-03-31  Junio C HamanoMerge branch 'dw/doc-status-no-longer-shows-pound-prefix'
2014-03-25  Junio C HamanoMerge branch 'dm/configure-iconv-locale-charset'
2014-03-25  Junio C HamanoMerge branch 'mh/remove-subtree-long-pathname-fix'
2014-03-25  Junio C HamanoMerge branch 'cp/am-patch-format-doc'
2014-03-21  Junio C HamanoMerge branch 'es/sh-i18n-envsubst'
2014-03-21  Junio C HamanoMerge branch 'jc/stash-pop-not-popped'
2014-03-18  Junio C HamanoMerge branch 'jk/commit-dates-parsing-fix' into maint
2014-03-18  Junio C HamanoMerge branch 'tr/diff-submodule-no-reuse-worktree'...
2014-03-18  Junio C HamanoMerge branch 'jc/check-attr-honor-working-tree' into...
2014-03-18  Junio C HamanoMerge branch 'bk/refresh-missing-ok-in-merge-recursive...
2014-03-18  Junio C HamanoMerge branch 'jk/config-path-include-fix' into maint
2014-03-18  Junio C HamanoMerge branch 'nd/diff-quiet-stat-dirty' into maint
2014-03-18  Junio C HamanoMerge branch 'mh/simplify-cache-tree-find'
2014-03-18  Junio C HamanoMerge branch 'jn/branch-lift-unnecessary-name-length...
2014-03-18  Junio C HamanoMerge branch 'nd/sha1-file-delta-stack-leakage-fix'
2014-03-14  Junio C HamanoMerge branch 'sh/write-pack-file-warning-message-fix'
2014-03-14  Junio C HamanoMerge branch 'jk/commit-dates-parsing-fix'
2014-03-14  Junio C HamanoMerge branch 'jh/note-trees-record-blobs'
2014-03-14  Junio C HamanoMerge branch 'tr/diff-submodule-no-reuse-worktree'
2014-03-14  Junio C HamanoMerge branch 'jc/check-attr-honor-working-tree'
2014-03-07  Junio C HamanoMerge branch 'jc/hold-diff-remove-q-synonym-for-no...
2014-03-07  Junio C HamanoMerge branch 'jc/core-checkstat-2.0'
2014-03-07  Junio C HamanoMerge branch 'jc/add-2.0-ignore-removal'
2014-03-07  Junio C HamanoMerge branch 'jn/add-2.0-u-A-sans-pathspec'
2014-03-07  Junio C HamanoMerge branch 'jc/push-2.0-default-to-simple'
2014-03-03  Junio C HamanoMerge branch 'sh/write-pack-file-warning-message-fix...
2014-02-27  Junio C HamanoMerge branch 'nd/test-rename-reset'
2014-02-27  Junio C HamanoMerge branch 'bs/stdio-undef-before-redef'
2014-02-27  Junio C HamanoMerge branch 'jk/config-path-include-fix'
2014-02-27  Junio C HamanoMerge branch 'nd/diff-quiet-stat-dirty'
2014-02-27  Junio C HamanoMerge branch 'bk/refresh-missing-ok-in-merge-recursive'
2014-02-13  Junio C HamanoMerge branch 'bm/merge-base-octopus-dedup' into maint
2014-02-13  Junio C HamanoMerge branch 'jc/revision-range-unpeel' into maint
next