Do not ignore merge options in interactive rebase
[gitweb.git] / t / t1508-at-combinations.sh
2013-06-24 Merge branch 'rr/am-quit-empty-then-abort-fix'
2013-06-24 Merge branch 'rt/cherry-pick-continue-advice-in-status'
2013-06-24 Merge branch 'nk/config-local-doc'
2013-06-24 Merge branch 'jk/mergetool-lib-refactor'
2013-06-24 Merge branch 'jk/doc-build-move-infordir-def'
2013-06-24 Merge branch 'dk/version-gen-gitdir'
2013-06-24 Merge branch 'dk/maint-t5150-dirname'
2013-06-24 Merge branch 'rs/unpack-trees-tree-walk-conflict-field'
2013-06-24 Merge branch 'mm/rm-coalesce-errors'
2013-06-24 Merge branch 'jh/libify-note-handling'
2013-06-24 Merge branch 'fc/sequencer-plug-leak'
2013-06-23 Merge branch 'mz/rebase-tests'
2013-06-23 Merge branch 'jk/unpack-entry-fallback-to-another'
2013-06-23 Merge branch 'jk/apache-test-for-2.4'
2013-06-23 Merge branch 'rr/rebase-autostash'
2013-06-23 Merge branch 'jg/status-config'
2013-06-21 Sync with maint
2013-06-20 Merge branch 'cm/remote-mediawiki'
2013-06-20 Merge branch 'rs/match-trees-refactor'
2013-06-20 Merge branch 'rs/logical-vs-binary-or'
2013-06-20 Merge branch 'mm/color-auto-default'
2013-06-20 Merge branch 'rs/discard-index-discard-array'
2013-06-20 Merge branch 'nd/traces'
2013-06-20 Merge branch 'fc/show-non-empty-errors-in-test'
2013-06-20 Merge branch 'fc/makefile'
2013-06-20 Merge branch 'js/test-ln-s-add'
2013-06-20 Merge branch 'nd/make-wildmatch-default'
2013-06-17 Merge tag 'gitgui-0.18.0' of git://repo.or.cz/git-gui
2013-06-14 Merge branch 'rr/complete-difftool-fixup'
2013-06-14 Merge branch 'mt/send-email-cc-match-fix'
2013-06-14 Merge branch 'bp/mediawiki-credential'
2013-06-14 Merge branch 'mh/reflife'
2013-06-14 Merge branch 'kb/full-history-compute-treesame-carefully-2'
2013-06-14 Merge branch 'rr/remove-contrib-some'
2013-06-11 Merge branch '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-05-17 Merge git://ozlabs.org/~paulus/gitk
2013-05-13 Merge git://ozlabs.org/~paulus/gitk
2013-05-08 Add new @ shortcut for HEAD
2013-05-08 tests: at-combinations: @{N} versus HEAD@{N}
2013-05-08 tests: at-combinations: increase coverage
2013-05-08 tests: at-combinations: improve nonsense()
2013-05-08 tests: at-combinations: check ref names directly
2013-05-08 tests: at-combinations: simplify setup
2013-03-28 Merge branch 'jc/remove-treesame-parent-in-simplify...
2013-02-04 Merge branch 'dl/am-hg-locale' into maint
2013-01-30 Merge git://ozlabs.org/~paulus/gitk
2013-01-28 Merge branch 'dl/am-hg-locale'
2013-01-23 Merge git://ozlabs.org/~paulus/gitk
2013-01-14 Merge branch 'jk/shortlog-no-wrap-doc' into maint
2013-01-12 Merge branch 'jk/shortlog-no-wrap-doc'
2013-01-10 Merge branch 'ta/remove-stale-translated-tut' into...
2013-01-08 Merge branch 'ta/remove-stale-translated-tut'
2012-10-17 Merge tag 'gitgui-0.17.0' of git://repo.or.cz/git-gui
2012-09-15 Merge branch 'da/gitk-reload-tag-contents' into maint...
2012-09-12 Merge git://ozlabs.org/~paulus/gitk
2012-09-12 Merge branch 'da/gitk-reload-tag-contents'
2012-08-24 Merge branch 'lp/no-cmd-http-fetch' into maint-1.7.11
2012-08-06 Merge branch 'jn/block-sha1' into maint
2012-08-06 Merge branch 'ms/daemon-doc-typo' into maint
2012-07-24 Merge branch 'jn/block-sha1'
2012-07-22 Merge branch 'ms/daemon-doc-typo'
2012-06-25 Merge branch 'lp/no-cmd-http-fetch'
2012-06-17 Merge branch 'js/maint-fast-export-mark-error' into...
2012-06-12 Merge branch 'js/maint-fast-export-mark-error'
2012-04-26 Merge branch 'rs/combine-diff-zero-context-at-the-begin...
2012-04-16 Merge branch 'rs/combine-diff-zero-context-at-the-begin...
2012-04-10 Add 'contrib/subtree/' from commit 'd3a04e06c77d57978bb...
2012-04-02 Merge branch 'pt/gitk'
2012-03-24 Merge gitk changes from Paul Mackerras at git://ozlabs...
2012-03-16 Merge branch 'th/doc-diff-submodule-option'
2011-12-21 Merge branch 'jl/submodule-status-failure-report' into...
2011-12-21 Merge branch 'ms/commit-cc-option-helpstring' into...
2011-12-18 Update jk/maint-strbuf-missing-init to builtin/ rename
2011-12-17 Merge git://ozlabs.org/~paulus/gitk
2011-12-14 Merge branch 'jl/submodule-status-failure-report'
2011-12-14 Merge branch 'ml/mailmap' into maint-1.7.6
2011-12-14 Merge branch 'master' of git://repo.or.cz/git-gui
2011-11-23 Merge branch 'maint' into tj/imap-send-remove-unused
2011-11-21 Merge branch 'jk/maint-1.6.2-upload-archive' into jk...
2011-11-18 Merge branch 'ml/mailmap' into maint
2011-11-10 Merge "Move 'builtin-*' into a 'builtin/' subdirectory"
2011-11-09 Merge branch 'fc/remote-seturl-usage-fix'
2011-11-09 Merge branch 'jc/maint-remove-renamed-ref' into maint
2011-10-21 Merge branch 'jc/maint-remove-renamed-ref'
2011-10-21 Merge branch 'jc/apply-blank-at-eof-fix' into maint
2011-10-19 Merge branch 'cb/httpd-test-fix-port'
2011-10-16 Merge git://repo.or.cz/git-gui
2011-10-16 Merge branch 'nm/grep-object-sha1-lock' into maint
2011-10-14 Merge branch 'jc/apply-blank-at-eof-fix'
2011-10-05 Merge branch 'rj/quietly-create-dep-dir'
2011-10-05 Merge branch 'gb/am-hg-patch'
2011-10-05 Merge branch 'nm/grep-object-sha1-lock'
2011-09-23 Merge branch 'gb/maint-am-patch-format-error-message...
2011-09-02 Merge branch 'gb/maint-am-stgit-author-to-from-fix'
2011-09-02 Merge branch 'gb/maint-am-patch-format-error-message'
next