checkout -m --conflict=diff3: add a label for ancestor
[gitweb.git] / t / t7060-wtstatus.sh
2010-01-17 Merge branch 'cc/reset-more'
2010-01-13 Merge branch 'jc/checkout-merge-base'
2010-01-13 Merge branch 'rs/maint-archive-match-pathspec'
2010-01-13 Merge branch 'il/vcs-helper'
2010-01-13 Merge branch 'cc/reset-more'
2010-01-13 Merge branch 'nd/sparse'
2010-01-12 Merge branch 'maint'
2010-01-12 Merge branch 'jc/maint-1.6.4-grep-lookahead' into jc...
2010-01-10 Merge branch 'tr/http-updates'
2010-01-10 Merge branch 'jk/maint-1.6.5-reset-hard'
2010-01-10 Merge branch 'jk/push-to-delete'
2010-01-10 Merge branch 'mm/config-path'
2010-01-10 Merge branch 'pm/cvs-environ'
2010-01-10 Merge branch 'tr/maint-1.6.5-bash-prompt-show-submodule...
2010-01-10 Merge branch 'bg/maint-remote-update-default'
2010-01-10 Merge branch 'mm/diag-path-in-treeish'
2010-01-10 Merge branch 'fc/opt-quiet-gc-reset'
2010-01-10 Merge branch 'maint'
2010-01-10 Merge branch 'maint-1.6.2' into maint
2010-01-07 Merge branch 'js/filter-branch-prime'
2010-01-07 Merge branch 'sb/maint-octopus'
2010-01-07 Merge branch 'mg/tag-d-show'
2010-01-07 Merge branch 'so/cvsserver-update'
2010-01-07 Merge branch 'bg/maint-add-all-doc'
2010-01-07 Merge branch 'mv/commit-date'
2010-01-07 Merge branch 'mo/bin-wrappers'
2010-01-03 Merge branch 'maint'
2009-12-31 Merge branch 'maint'
2009-12-31 Merge branch 'maint-1.6.0' into maint
2009-12-30 Merge branch 'maint'
2009-12-30 Merge branch 'maint-1.6.1' into maint
2009-12-28 Merge branch 'jk/1.7.0-status'
2009-12-27 Merge branch 'nf/maint-fix-index-ext-len-on-be64' into...
2009-12-26 Merge branch 'jc/1.7.0-diff-whitespace-only-status'
2009-12-26 Merge branch 'jc/1.7.0-push-safety'
2009-12-26 Merge branch 'jc/1.7.0-send-email-no-thread-default'
2009-12-12 status/commit: do not suggest "reset HEAD <path>" while...
2009-12-12 commit/status: "git add <path>" is not necessarily...
2009-12-09 Merge git://repo.or.cz/git-gui
2009-12-09 Merge git://git.kernel.org/pub/scm/gitk/gitk
2009-12-03 Merge branch 'jc/maint-am-keep' into maint
2009-12-03 Merge branch 'np/maint-sideband-favor-status' into...
2009-12-01 Merge branch 'jn/gitweb-blame'
2009-11-30 Merge branch 'jc/mailinfo-remove-brackets'
2009-11-30 Merge branch 'jc/maint-am-keep'
2009-11-18 Merge branch 'np/maint-sideband-favor-status'
2009-11-16 Merge branch 'jk/maint-1.6.3-ls-files-i' into maint
2009-11-16 Merge branch 'jc/maint-blank-at-eof' into maint
2009-11-16 Merge branch 'jc/maint-1.6.3-graft-trailing-space'...
2009-11-16 Merge branch 'tr/maint-roff-quote' into maint
2009-11-10 Merge branch 'jk/maint-1.6.3-ls-files-i'
2009-10-31 Merge branch 'jc/maint-1.6.3-graft-trailing-space'
2009-10-31 Merge branch 'tr/maint-roff-quote'
2009-10-28 Merge branch 'maint-1.6.4' into maint
2009-10-27 Merge git://repo.or.cz/git-gui
2009-10-25 Merge branch 'maint-1.6.4' into maint
2009-10-24 Merge branch 'jp/maint-send-email-fold' into maint
2009-10-24 Merge branch 'jn/maint-1.6.3-check-ref-format-doc'...
2009-10-24 Merge branch 'pv/maint-add-p-no-exclude' into maint
2009-10-19 Merge branch 'jp/maint-send-email-fold'
2009-10-19 Merge branch 'jn/maint-1.6.3-check-ref-format-doc'
2009-10-19 Merge branch 'jk/maint-1.6.3-ls-files-no-ignore-cached'
2009-10-17 Merge branch 'jc/maint-blank-at-eof'
2009-10-17 Merge branch 'maint-1.6.4' into maint
2009-10-14 Merge branch 'pv/maint-add-p-no-exclude'
2009-10-13 Merge branch 'maint-1.6.4' into maint
2009-10-09 Merge branch 'rs/maint-archive-prefix'
2009-10-09 Merge branch 'maint'
2009-10-08 Merge branch 'maint'
2009-10-04 Merge branch 'maint'
2009-09-21 Merge git://git.kernel.org/pub/scm/gitk/gitk
2009-09-20 Merge branch 'maint'
2009-09-16 Merge 1.6.4.4 in
2009-09-14 Merge branch 'maint'
2009-09-13 Merge branch 'db/vcs-helper'
2009-09-13 Merge branch 'maint'
2009-09-07 Merge branch 'maint'
2009-09-07 Merge branch 'jc/mailinfo-scissors'
2009-09-07 Merge branch 'jk/clone-b'
2009-09-07 Merge branch 'jc/upload-pack-hook'
2009-09-07 Merge branch 'tr/reset-checkout-patch'
2009-09-07 Merge branch 'np/maint-1.6.3-deepen'
2009-09-06 Merge branch 'maint'
2009-09-03 Merge branch 'maint'
2009-09-03 Merge branch 'maint'
2009-09-01 Merge branch 'lt/approxidate'
2009-09-01 Merge branch 'mr/gitweb-snapshot'
2009-09-01 Merge branch 'tf/diff-whitespace-incomplete-line'
2009-08-29 Sync with 1.6.4.2
2009-08-29 Merge branch 'mm/reset-report'
2009-08-29 Merge branch 'jk/maint-1.6.3-checkout-unborn'
2009-08-29 Merge branch 'np/maint-1.6.3-deepen'
2009-08-29 Merge branch 'jc/shortstatus'
2009-08-22 git status: not "commit --dry-run" anymore
2009-08-07 status: show worktree status of conflicted paths separately
2009-08-05 diff-index: report unmerged new entries