revision: Turn off history simplification in --ancestry-path mode
[gitweb.git] / t / t3507-cherry-pick-conflict.sh
2010-04-20 Merge branch 'maint'
2010-04-19 Merge branch 'rr/remote-helper-doc'
2010-04-19 Merge branch 'wp/doc-filter-direction'
2010-04-19 Merge branch 'jk/maint-diffstat-overflow'
2010-04-19 Merge branch 'jg/auto-initialize-notes-with-percent...
2010-04-19 Merge branch 'maint'
2010-04-19 Merge git://git.kernel.org/pub/scm/gitk/gitk
2010-04-17 Merge branch 'maint'
2010-04-14 Merge branch 'maint'
2010-04-11 Merge branch 'jl/maint-submodule-gitfile-awareness'
2010-04-11 Sync with 1.7.0.5
2010-04-11 Merge branch 'jc/doc-submit-gmail'
2010-04-11 t3507: Make test executable
2010-04-10 Merge branch 'mr/gitweb-jsmin'
2010-04-10 Merge branch 'jl/maint-submodule-gitfile-awareness'
2010-04-10 Merge branch 'maint'
2010-04-10 Merge branch 'rc/maint-reflog-msg-for-forced-branch'
2010-04-09 Merge early parts of jk/cached-textconv
2010-04-09 Merge branch 'maint'
2010-04-07 Merge branch 'mg/notes-reflog'
2010-04-07 Merge branch 'jn/mailinfo-scissors'
2010-04-06 Merge branch 'da/maint-python-startup'
2010-04-06 Merge branch 'ic/bash-completion-rpm'
2010-04-06 Merge branch 'sb/fmt-merge-msg'
2010-04-06 Merge branch 'jc/conflict-marker-size'
2010-04-06 Merge branch 'ef/maint-empty-commit-log'
2010-04-06 Merge branch 'sg/bash-completion'
2010-04-04 Merge branch 'maint'
2010-04-03 Merge branch 'mb/rebase-i-no-ff'
2010-04-03 Merge branch 'sp/maint-http-backend-die-triggers-die...
2010-04-03 Merge branch 'rr/imap-send-unconfuse-from-line'
2010-04-03 Merge branch 'mg/use-default-abbrev-length-in-rev-list'
2010-04-03 Merge branch 'mg/maint-send-email-lazy-editor'
2010-04-03 Merge branch 'rb/maint-python-path'
2010-04-03 Merge branch 'jn/merge-diff3-label'
2010-03-21 cherry-pick, revert: add a label for ancestor
2010-03-21 revert: clarify label on conflict hunks
2010-03-21 tests: document cherry-pick behavior in face of conflicts