Merge branch 'rr/core-tutorial'
[gitweb.git] / builtin-checkout.c
2010-01-20 Merge branch 'rr/core-tutorial'
2010-01-20 Merge branch 'jc/cache-unmerge'
2010-01-20 Merge branch 'js/exec-error-report'
2010-01-20 Merge branch 'jc/ls-files-ignored-pathspec'
2010-01-20 Merge branch 'jc/grep-lookahead'
2010-01-20 Merge branch 'jc/maint-strbuf-add-fix-doubling'
2010-01-20 Merge branch 'mm/conflict-advice'
2010-01-20 Merge branch 'da/difftool'
2010-01-20 Merge branch 'mh/rebase-fixup'
2010-01-20 Merge branch 'ns/rebase-auto-squash'
2010-01-20 Merge branch 'mh/rebase-fixup' (early part)
2010-01-20 Merge branch 'il/push-set-upstream'
2010-01-20 Merge branch 'jk/warn-author-committer-after-commit'
2010-01-20 Merge branch 'jc/ident'
2010-01-20 Merge branch 'tr/http-push-ref-status'
2010-01-20 Merge branch 'bk/fix-relative-gitdir-file'
2010-01-20 Merge branch 'sd/cd-p-show-toplevel'
2010-01-20 Merge branch 'jc/symbol-static'
2010-01-20 Sync with 1.6.6.1
2010-01-20 Merge branch 'bg/maint-remote-update-default' into...
2010-01-20 Merge branch 'sb/maint-octopus' into maint
2010-01-20 Merge branch 'bg/maint-add-all-doc' into maint
2010-01-20 Merge branch 'maint-1.6.5' into maint
2010-01-20 Merge branch 'jk/maint-1.6.5-reset-hard' into maint...
2010-01-20 Merge branch 'tr/maint-1.6.5-bash-prompt-show-submodule...
2010-01-20 Merge branch 'dp/maint-1.6.5-fast-import-non-commit...
2010-01-20 Merge branch 'jm/maint-1.6.5-grep-NUL-terminate' into...
2010-01-20 Merge branch 'maint'
2010-01-19 Merge branch 'maint-1.6.4' into maint-1.6.5
2010-01-19 Merge branch 'maint-1.6.3' into maint-1.6.4
2010-01-19 Merge branch 'maint-1.6.2' into maint-1.6.3
2010-01-19 Merge branch 'maint'
2010-01-19 Merge branch 'dp/maint-1.6.5-fast-import-non-commit...
2010-01-19 Merge branch 'jc/rerere'
2010-01-19 Merge branch 'pc/uninteresting-submodule-disappear...
2010-01-19 Merge branch 'nd/include-termios-for-osol'
2010-01-19 Merge branch 'js/windows'
2010-01-19 Merge branch 'jm/maint-1.6.5-grep-NUL-terminate' into...
2010-01-18 Merge branch 'tc/test-locate-httpd'
2010-01-18 Merge branch 'jh/commit-status'
2010-01-17 Merge branch 'jn/makefile'
2010-01-17 Merge branch 'jc/maint-1.6.1-checkout-m-custom-merge'
2010-01-17 Merge branch 'tc/clone-v-progress'
2010-01-17 Merge branch 'tc/smart-http-restrict'
2010-01-17 Merge branch 'jk/run-command-use-shell'
2010-01-17 Merge branch 'sr/gfi-options'
2010-01-17 Merge branch 'maint'
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 '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-10 Merge branch 'maint-1.6.1' into maint-1.6.2
2010-01-10 Merge branch 'maint-1.6.0' into maint-1.6.1
2010-01-07 Merge branch 'js/filter-branch-prime'
2010-01-07 Merge branch 'sb/maint-octopus'
2010-01-07 Merge branch 'bg/maint-add-all-doc'
2010-01-07 checkout -m: do not try to fall back to --merge from...
2010-01-06 checkout -m path: fix recreating conflicts
2009-12-31 Merge branch 'maint-1.6.0' into maint
2009-12-30 Merge branch 'maint-1.6.1' into maint
2009-12-30 Merge branch 'maint-1.6.0' into maint-1.6.1
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-26 Merge branch 'sr/vcs-helper'
2009-12-26 resolve-undo: "checkout -m path" uses resolve-undo...
2009-12-26 resolve-undo: record resolved conflicts in a new index...
2009-12-22 Merge branch 'maint'
2009-12-20 Merge branch 'maint'
2009-12-16 Merge branch 'maint' to sync with 1.6.5.7
2009-12-11 Sync with 1.6.5.6
2009-12-09 Merge git://repo.or.cz/git-gui
2009-12-09 Merge git://git.kernel.org/pub/scm/gitk/gitk
2009-12-09 Merge branch 'maint'
2009-12-07 Merge branch 'master' into il/vcs-helper
2009-12-05 Sync with 1.6.5.5
2009-12-03 Merge branch 'maint'
2009-12-03 Merge branch 'jc/maint-am-keep' into maint
2009-12-03 Merge branch 'np/maint-sideband-favor-status' into...
2009-12-03 Merge in 1.6.5.4
2009-12-03 Merge branch 'maint'
2009-12-02 Merge branch 'maint'
2009-12-01 Merge branch 'maint'
2009-12-01 Merge branch 'jc/deprecate-old-syntax-from-merge'
next